diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2016-01-26 03:26:09 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-01-26 03:27:42 +0000 |
| commit | c17a21a73001fa094d0aee31c37ffe40898f88ea (patch) | |
| tree | 0f1461a608b2a3a7cf10edcdcdd21bc4d65f4575 | |
| parent | c44df0cf77026e83c0733d6d455a07c98559a1c4 (diff) | |
Remove klibc hook in favour of klibc's own
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | debian/TODO | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | hooks/klibc | 33 |
3 files changed, 1 insertions, 36 deletions
diff --git a/debian/TODO b/debian/TODO index 9617b0c..43b37ce 100644 --- a/debian/TODO +++ b/debian/TODO @@ -11,5 +11,3 @@ TODO copy_exec, maybe use dracut copy logic. o root loop support. - - o Eliminate klibc hook? diff --git a/debian/control b/debian/control index 7f9b36f..fc9cb7b 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Package: initramfs-tools-core Architecture: all Multi-Arch: foreign Recommends: ${busybox:Recommends} -Depends: klibc-utils (>= 2.0.4-7~), cpio, kmod | module-init-tools, udev, ${misc:Depends} +Depends: klibc-utils (>= 2.0.4-8~), cpio, kmod | module-init-tools, udev, ${misc:Depends} Suggests: bash-completion Breaks: initramfs-tools (<< 0.121~) Replaces: initramfs-tools (<< 0.121~) diff --git a/hooks/klibc b/hooks/klibc deleted file mode 100755 index d985036..0000000 --- a/hooks/klibc +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -PREREQ="" - -prereqs() -{ - echo "$PREREQ" -} - -case $1 in -# get pre-requisites -prereqs) - prereqs - exit 0 - ;; -esac - -# klibc -cp -pnL /usr/lib/klibc/bin/* ${DESTDIR}/bin -cp -pL /lib/klibc-*.so ${DESTDIR}/lib -rm -f ${DESTDIR}/bin/kinit* ${DESTDIR}/bin/zcat -if [ "${BUSYBOX}" = "n" ] || [ -z "${BUSYBOXDIR}" ]; then - if [ -e ${DESTDIR}/bin/sh.shared ]; then - # Some platforms build a shared klibc/sh: - mv ${DESTDIR}/bin/sh.shared ${DESTDIR}/bin/sh - elif [ -e /usr/lib/klibc/bin/sh ]; then - # Others build a static version instead: - cp -pL /usr/lib/klibc/bin/sh ${DESTDIR}/bin/sh - fi -else - # Nobody wanted it, so save a tiny bit of space: - rm -f ${DESTDIR}/bin/sh.shared -fi |