Mercurial > hg > aboriginal
comparison host-tools.sh @ 932:61e95d49f520
Have host-tools.sh only make e2fs or squashfs tools if we need them.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sun, 13 Dec 2009 00:13:09 -0600 |
parents | b69d7013e16e |
children | c381381fa460 |
comparison
equal
deleted
inserted
replaced
931:809d705262f8 | 932:61e95d49f520 |
---|---|
148 | 148 |
149 # The hdb.img of run-emulator.sh and run-from-build.sh uses e2fsprogs' | 149 # The hdb.img of run-emulator.sh and run-from-build.sh uses e2fsprogs' |
150 # fsck.ext2 and tune2fs. These are installed by default in most distros | 150 # fsck.ext2 and tune2fs. These are installed by default in most distros |
151 # (which genext2fs isn't), and genext2fs doesn't have ext3 support anyway. | 151 # (which genext2fs isn't), and genext2fs doesn't have ext3 support anyway. |
152 | 152 |
153 if [ ! -f "${STAGE_DIR}"/mke2fs ] | 153 if [ ! -f "${STAGE_DIR}"/mke2fs ] && [ "$SYSIMAGE_TYPE" == ext2 ] |
154 then | 154 then |
155 setupfor e2fsprogs && | 155 setupfor e2fsprogs && |
156 ./configure --disable-tls --disable-nls --enable-htree && | 156 ./configure --disable-tls --disable-nls --enable-htree && |
157 make -j "$CPUS" && | 157 make -j "$CPUS" && |
158 cp misc/{mke2fs,tune2fs} resize/resize2fs "${STAGE_DIR}" && | 158 cp misc/{mke2fs,tune2fs} resize/resize2fs "${STAGE_DIR}" && |
161 cleanup | 161 cleanup |
162 fi | 162 fi |
163 | 163 |
164 # Squashfs is an alternate packaging option. | 164 # Squashfs is an alternate packaging option. |
165 | 165 |
166 if [ ! -f "${STAGE_DIR}"/mksquashfs ] | 166 if [ ! -f "${STAGE_DIR}"/mksquashfs ] && |
167 ([ -z "$SYSIMAGE_TYPE" ] || [ "$SYSIMAGE_TYPE" == squashfs ]) | |
167 then | 168 then |
168 setupfor squashfs && | 169 setupfor squashfs && |
169 cd squashfs-tools && | 170 cd squashfs-tools && |
170 make -j $CPUS && | 171 make -j $CPUS && |
171 cp mksquashfs unsquashfs "${STAGE_DIR}" | 172 cp mksquashfs unsquashfs "${STAGE_DIR}" |