manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use mkfs.ext2/mkfs.ext2 instead of genext2fs (Closes: #629533).

This commit is contained in:
Colin Watson 2011-06-08 10:02:10 +02:00 committed by Daniel Baumann
parent a951e84c4f
commit 8b05781dbc
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -16,7 +16,7 @@ Depends: ${misc:Depends}, debootstrap | cdebootstrap | cdebootstrap-static
Recommends: cpio, gettext-base, gnu-fdisk
Suggests:
dosfstools, genisoimage, memtest86+ | memtest86, mtools, parted,
squashfs-tools | genext2fs | mtd-tools, sudo | fakeroot, syslinux | grub,
squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
uuid-runtime, win32-loader
Description: Debian Live - System Build Scripts
live-build contains the scripts that build a Debian Live system image from a

2
debian/live-build.bug-script vendored
View File

@ -6,7 +6,7 @@ DEFAULT_SETTINGS="/etc/live/build.conf"
dpkg -l debootstrap cdebootstrap
# Checking suggests
dpkg -l dosfstools genisoimage memtest86+ memtest86 mtools parted squashfs-tools genext2fs mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader
dpkg -l dosfstools genisoimage memtest86+ memtest86 mtools parted squashfs-tools mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader
if [ -e "${DEFAULT_SETTINGS}" ]; then
echo "Contents of ${DEFAULT_SETTINGS}:"

31
scripts/build/lb_binary_rootfs
View File

@ -86,7 +86,7 @@ done
case "${LB_CHROOT_FILESYSTEM}" in
ext2|ext3)
# Checking depends
Check_package chroot/usr/bin/genext2fs genext2fs
Check_package chroot/sbin/mkfs.ext2 e2fsprogs
# Restoring cache
Restore_cache cache/packages_binary
@ -102,21 +102,30 @@ case "${LB_CHROOT_FILESYSTEM}" in
case "${LB_BUILD_WITH_CHROOT}" in
true)
DU_DIM="$(du -ks chroot/chroot | cut -f1)"
DU_DIM="$(du -ms chroot/chroot | cut -f1)"
INODES="$(find chroot/chroot | wc -l)"
;;
false)
DU_DIM="$(du -ks chroot | cut -f1)"
DU_DIM="$(du -ms chroot | cut -f1)"
INODES="$(find chroot | wc -l)"
;;
esac
REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_CHROOT_FILESYSTEM})"
RESERVED_PERCENTAGE="--reserved-percentage"
REAL_INODES="$(Calculate_partition_size ${INODES} ${LB_CHROOT_FILESYSTEM})"
case "${LB_BUILD_WITH_CHROOT}" in
true)
Chroot chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LB_CHROOT_FILESYSTEM}"
dd if=/dev/zero of=chroot/filesystem.${LB_CHROOT_FILESYSTEM} bs=1024k count=0 seek=${REAL_DIM}
Chroot chroot "mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 filesystem.${LB_CHROOT_FILESYSTEM}"
mkdir -p filesystem.tmp
${LB_ROOT_COMMAND} mount -o loop chroot/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp
cp -a chroot/chroot/* filesystem.tmp
${LB_ROOT_COMMAND} umount filesystem.tmp
rmdir filesystem.tmp
# Move image
mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS}
@ -173,7 +182,15 @@ case "${LB_CHROOT_FILESYSTEM}" in
;;
false)
genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
dd if=/dev/zero of=binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} bs=1024k count=0 seek=${REAL_DIM}
mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
mkdir -p filesystem.tmp
${LB_ROOT_COMMAND} mount -o loop binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp
cp -a chroot/* filesystem.tmp
${LB_ROOT_COMMAND} umount filesystem.tmp
rmdir filesystem.tmp
;;
esac

1
scripts/build/lb_source_debian
View File

@ -61,7 +61,6 @@ dosfstools
genisoimage
parted
squashfs-tools
genext2fs
mtd-tools
EOF