From 66d268cdd1af2c65f338aa5d0e1e81ca964dae4f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 8 Mar 2009 04:15:11 +0100
Subject: [PATCH] initramfs-tools: use the new klibc pkgs, saves ~1.5MBs.

--HG--
extra : convert_revision : 4a6e3452348cec1a4bd3e8ad6e514f470eb2c7d8
---
 .../initramfs-tools/initramfs-tools-xbps.diff | 90 +++++++++++--------
 templates/initramfs-tools/template            |  8 +-
 2 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/templates/initramfs-tools/initramfs-tools-xbps.diff b/templates/initramfs-tools/initramfs-tools-xbps.diff
index 48fabb433e5..99ef9d1b687 100644
--- a/templates/initramfs-tools/initramfs-tools-xbps.diff
+++ b/templates/initramfs-tools/initramfs-tools-xbps.diff
@@ -50,43 +50,6 @@
  			echo "W: ${cm_x} hook script requires at least kernel version ${minver}" >&2
  			echo "W: not generating requested initramfs for kernel ${curversion}" >&2
  			exit 2
---- mkinitramfs.orig	2009-02-17 15:56:33.000000000 +0100
-+++ mkinitramfs	2009-03-07 06:23:35.514727457 +0100
-@@ -8,8 +8,7 @@ keep="n"
- CONFDIR="/etc/initramfs-tools"
- verbose="n"
- errors_to="2>/dev/null"
--# BUSYBOXDIR="/usr/lib/initramfs-tools/bin/"
--BUSYBOXDIR="/bin"
-+BUSYBOXDIR="/usr/lib/initramfs-tools/bin/"
- 
- OPTIONS=`getopt -o d:ko:r:v -n "$0" -- "$@"`
- 
-@@ -141,7 +140,7 @@ fi
- DESTDIR="$(mktemp -t -d mkinitramfs_XXXXXX)" || exit 1
- __TMPCPIOGZ="$(mktemp -t mkinitramfs-OL_XXXXXX)" || exit 1
- 
--DPKG_ARCH=`dpkg --print-installation-architecture`
-+DPKG_ARCH=`uname -m`
- 
- # Export environment for hook scripts.
- #
-@@ -249,12 +248,9 @@ fi
- copy_exec /sbin/modprobe /sbin
- copy_exec /sbin/depmod /sbin
- copy_exec /sbin/rmmod /sbin
--mkdir -p "${DESTDIR}/etc/modprobe.d"
--cp -a /etc/modprobe.d/* "${DESTDIR}/etc/modprobe.d/"
--
--# workaround: libgcc always needed on old-abi arm
--if [ "$DPKG_ARCH" = arm ] || [ "$DPKG_ARCH" = armeb ]; then
--	cp -a /lib/libgcc_s.so.1 "${DESTDIR}/lib/"
-+if [ -d /etc/modprobe.d ]; then
-+	mkdir -p "${DESTDIR}/etc/modprobe.d"
-+	cp -a /etc/modprobe.d/* "${DESTDIR}/etc/modprobe.d/"
- fi
- 
- run_scripts /usr/share/initramfs-tools/hooks
 --- update-initramfs.orig	2009-03-07 06:30:03.039700454 +0100
 +++ update-initramfs	2009-03-07 06:32:05.679694852 +0100
 @@ -1,4 +1,4 @@
@@ -128,3 +91,56 @@
  				worklist="${worklist} ${gsv_x} ${gsv_i}"
  				gsv_x=""
  			else
+--- mkinitramfs.orig	2009-02-17 15:56:33.000000000 +0100
++++ mkinitramfs	2009-03-08 04:05:23.555799879 +0100
+@@ -8,8 +8,7 @@ keep="n"
+ CONFDIR="/etc/initramfs-tools"
+ verbose="n"
+ errors_to="2>/dev/null"
+-# BUSYBOXDIR="/usr/lib/initramfs-tools/bin/"
+-BUSYBOXDIR="/bin"
++BUSYBOXDIR="/usr/lib/initramfs-tools/bin/"
+ 
+ OPTIONS=`getopt -o d:ko:r:v -n "$0" -- "$@"`
+ 
+@@ -141,7 +140,7 @@ fi
+ DESTDIR="$(mktemp -t -d mkinitramfs_XXXXXX)" || exit 1
+ __TMPCPIOGZ="$(mktemp -t mkinitramfs-OL_XXXXXX)" || exit 1
+ 
+-DPKG_ARCH=`dpkg --print-installation-architecture`
++DPKG_ARCH=`uname -m`
+ 
+ # Export environment for hook scripts.
+ #
+@@ -232,7 +231,6 @@ fi
+ 
+ # Busybox
+ if [ "${BUSYBOX}" = "n" ] || [ ! -e ${BUSYBOXDIR}/busybox ]; then
+-	mv ${DESTDIR}/bin/sh.shared ${DESTDIR}/bin/sh
+ 	# those root need busybox
+ 	eval "$(mount | awk '/ \/ / {print "r_dev=" $1; exit}')"
+ 	if [ "${r_dev#/dev/mapper/}" != "${r_dev}" ]; then
+@@ -246,15 +244,14 @@ else
+ fi
+ 
+ # Modutils
+-copy_exec /sbin/modprobe /sbin
+-copy_exec /sbin/depmod /sbin
+-copy_exec /sbin/rmmod /sbin
+-mkdir -p "${DESTDIR}/etc/modprobe.d"
+-cp -a /etc/modprobe.d/* "${DESTDIR}/etc/modprobe.d/"
+-
+-# workaround: libgcc always needed on old-abi arm
+-if [ "$DPKG_ARCH" = arm ] || [ "$DPKG_ARCH" = armeb ]; then
+-	cp -a /lib/libgcc_s.so.1 "${DESTDIR}/lib/"
++copy_exec /usr/lib/klibc/sbin/modprobe /sbin
++copy_exec /usr/lib/klibc/sbin/depmod /sbin
++copy_exec /usr/lib/klibc/sbin/lsmod /sbin
++copy_exec /usr/lib/klibc/sbin/rmmod /sbin
++copy_exec /usr/lib/klibc/sbin/insmod /sbin
++if [ -d /etc/modprobe.d ]; then
++	mkdir -p "${DESTDIR}/etc/modprobe.d"
++	cp -a /etc/modprobe.d/* "${DESTDIR}/etc/modprobe.d/"
+ fi
+ 
+ run_scripts /usr/share/initramfs-tools/hooks
diff --git a/templates/initramfs-tools/template b/templates/initramfs-tools/template
index 6440172188b..181fc8d9a3b 100644
--- a/templates/initramfs-tools/template
+++ b/templates/initramfs-tools/template
@@ -25,15 +25,15 @@ conf_files="/etc/$pkgname/initramfs.conf /etc/$pkgname/update-initramfs.conf
 Add_dependency full glibc
 Add_dependency full cpio
 Add_dependency full util-linux-ng
-Add_dependency full klibc-utils
-Add_dependency full module-init-tools
-Add_dependency full busybox-initramfs
+Add_dependency build klibc
+Add_dependency run klibc-utils
+Add_dependency full klibc-udev
+Add_dependency full klibc-module-init-tools
 Add_dependency full gawk
 Add_dependency full findutils
 Add_dependency full sed
 Add_dependency full grep
 Add_dependency full gzip
-Add_dependency full udev
 
 do_install()
 {