From 9538b11955c6641f1d6f23989f0b54a9b8375e4b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 19 Dec 2009 04:48:47 +0100 Subject: [PATCH] initramfs-tools: update to 0.94. klibc requirement and associated code has been removed due to its current state, i.e unmaintained. Switch completely to busybox, removes another annoying build/run dependency. --HG-- extra : convert_revision : 67ff872d24eb547f538ec656d5565c82d496dcda --- srcpkgs/initramfs-tools/files/hook-functions | 2 +- srcpkgs/initramfs-tools/files/hooks/busybox | 2 +- srcpkgs/initramfs-tools/files/hooks/klibc | 24 ---------------- srcpkgs/initramfs-tools/files/init | 29 +++++++++++--------- srcpkgs/initramfs-tools/files/scripts/local | 7 +---- srcpkgs/initramfs-tools/template | 10 ++----- 6 files changed, 22 insertions(+), 52 deletions(-) delete mode 100755 srcpkgs/initramfs-tools/files/hooks/klibc diff --git a/srcpkgs/initramfs-tools/files/hook-functions b/srcpkgs/initramfs-tools/files/hook-functions index ee78f1d43c..106b8752fe 100644 --- a/srcpkgs/initramfs-tools/files/hook-functions +++ b/srcpkgs/initramfs-tools/files/hook-functions @@ -237,7 +237,7 @@ dep_add_modules() # find out real rootfs on auto type if [ "${FSTYPE}" = "auto" ]; then - eval "$(/usr/lib/klibc/bin/fstype ${root})" + eval "$(blkid -s TYPE -o value ${root})" fi # check that fstype rootfs recognition diff --git a/srcpkgs/initramfs-tools/files/hooks/busybox b/srcpkgs/initramfs-tools/files/hooks/busybox index 6f0b7495b7..1b1107103e 100755 --- a/srcpkgs/initramfs-tools/files/hooks/busybox +++ b/srcpkgs/initramfs-tools/files/hooks/busybox @@ -1,6 +1,6 @@ #!/bin/sh -PREREQ="klibc" +PREREQ="" prereqs() { diff --git a/srcpkgs/initramfs-tools/files/hooks/klibc b/srcpkgs/initramfs-tools/files/hooks/klibc deleted file mode 100755 index 1cee672b4d..0000000000 --- a/srcpkgs/initramfs-tools/files/hooks/klibc +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -PREREQ="" - -prereqs() -{ - echo "$PREREQ" -} - -case $1 in -# get pre-requisites -prereqs) - prereqs - exit 0 - ;; -esac - -# klibc -ln -s /usr/lib/klibc/bin/* ${DESTDIR}/bin -ln -s /lib/klibc-*.so ${DESTDIR}/lib -rm -f ${DESTDIR}/bin/kinit* ${DESTDIR}/bin/gzip \ - ${DESTDIR}/bin/zcat ${DESTDIR}/bin/gunzip - -exit 0 diff --git a/srcpkgs/initramfs-tools/files/init b/srcpkgs/initramfs-tools/files/init index ac77d019d0..842b0248ee 100755 --- a/srcpkgs/initramfs-tools/files/init +++ b/srcpkgs/initramfs-tools/files/init @@ -1,18 +1,21 @@ -#!/bin/sh +#!/bin/busybox sh echo "Starting up the initramfs, please wait..." -# Create some required busybox symlinks. -if [ -x /bin/busybox ]; then - for f in cut touch tr grep awk tail basename ls cp rm \ - head expr du sed rmdir; do - busybox ln -s /bin/busybox /bin/${f} - done - rm -f /bin/dmesg - busybox ln -s /bin/busybox /bin/dmesg - busybox ln -s /bin/busybox /sbin/pkill -fi -dmesg -n1 +BUSYBOX_LINKS=" +[ [[ ash awk basename cat chgrp chmod chown chroot clear cmp comm cp \ +cut date dd deallocvt df dirname dmesg dnsdomainname du echo \ +egrep env expand expr false fgrep find fsync fuser grep head hexdump hostname \ +id install kbd_mode kill killall killall5 ln loadfont losetup ls lsmod \ +mkdir mkfifo mknod mktemp more mount mv pgrep pidof pivot_root pkill \ +printenv printf ps pwd readlink realpath rm rmdir sed seq sh sleep sort \ +split stat stty sum switch_root sync tac tail tee test top touch tr true tty \ +umount uname uniq vi wc xargs yes" + +# Create required busybox symlinks +for f in $BUSYBOX_LINKS; do + /bin/busybox ln -s /bin/busybox /bin/${f} +done [ -d /dev ] || mkdir -m 0755 /dev [ -d /root ] || mkdir -m 0700 /root @@ -266,5 +269,5 @@ unset resume unset resume_offset # Chain to real filesystem -exec run-init ${rootmnt} ${init} "$@" +exec switch_root ${rootmnt} ${init} "$@" panic "Could not execute run-init." diff --git a/srcpkgs/initramfs-tools/files/scripts/local b/srcpkgs/initramfs-tools/files/scripts/local index 77ac68e262..d7db74a0f1 100644 --- a/srcpkgs/initramfs-tools/files/scripts/local +++ b/srcpkgs/initramfs-tools/files/scripts/local @@ -8,12 +8,7 @@ get_fstype () local FS FSTYPE FSSIZE RET FS="${1}" - # blkid has a more complete list of file systems, - # but fstype is more robust - eval $(fstype "${FS}" 2> /dev/null) - if [ "$FSTYPE" = "unknown" ] && [ -x /sbin/blkid ]; then - FSTYPE=$(/sbin/blkid -s TYPE -o value "${FS}" 2> /dev/null) - fi + FSTYPE=$(/sbin/blkid -s TYPE -o value "${FS}" 2> /dev/null) RET=$? if [ -z "${FSTYPE}" ]; then diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template index 3b11fe0b46..a92831a32c 100644 --- a/srcpkgs/initramfs-tools/template +++ b/srcpkgs/initramfs-tools/template @@ -1,7 +1,6 @@ # Template file for 'initramfs-tools' pkgname=initramfs-tools -version=0.93.3 -revision=3 +version=0.94 build_style=custom-install short_desc="Tools for generating an initramfs" maintainer="Juan RP " @@ -11,9 +10,8 @@ long_desc=" Linux kernel. The initramfs is a gzipped cpio archive. At boot time, the kernel unpacks that archive into RAM, mounts and uses it as initial root file system. The mounting of the real root file system occurs in early user - space. klibc provides utilities to setup root. Having the root on EVMS, MD, - LVM2, LUKS or NFS is also supported. Any boot loader with initrd support is - able to load an initramfs archive." + space. Having the root on EVMS, MD, LVM2, LUKS or NFS is also supported. + Any boot loader with initrd support is able to load an initramfs archive." noextract=yes noarch=yes @@ -32,8 +30,6 @@ Add_dependency full grep Add_dependency full gzip Add_dependency full udev Add_dependency full module-init-tools -Add_dependency build klibc -Add_dependency run klibc-utils Add_dependency full busybox-initramfs do_install()