Author: baggins Date: Wed Jan 20 16:47:11 2010 GMT Module: packages Tag: HEAD ---- Log message: - added support for initrd static programs
---- Files affected: packages/initramfs-tools: initramfs-tools.spec (1.21 -> 1.22) , initramfs-tools-initrdtools.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/initramfs-tools/initramfs-tools.spec diff -u packages/initramfs-tools/initramfs-tools.spec:1.21 packages/initramfs-tools/initramfs-tools.spec:1.22 --- packages/initramfs-tools/initramfs-tools.spec:1.21 Wed Jan 20 16:07:09 2010 +++ packages/initramfs-tools/initramfs-tools.spec Wed Jan 20 17:47:06 2010 @@ -2,14 +2,13 @@ # # TODO: # - clean up Requires (still) -# - add support for initrd static programs # - test cryptroot, dmraid, mdadm, opensc, openct modules # Summary: Tools for generating an initramfs Summary(pl.UTF-8): Narzędzia do tworzenia initramfs Name: initramfs-tools Version: 0.93.4 -Release: 1 +Release: 1.1 License: Public Domain Group: Applications/System Source0: http://ftp.de.debian.org/debian/pool/main/i/initramfs-tools/%{name}_%{version}.tar.gz @@ -18,6 +17,7 @@ Patch1: %{name}-nobb.patch Patch2: %{name}-gz-modules.patch Patch3: %{name}-less-noise.patch +Patch4: %{name}-initrdtools.patch URL: http://git.debian.org/?p=kernel/initramfs-tools.git;a=shortlog Requires: /usr/bin/ldd Requires: /usr/bin/locale @@ -70,8 +70,10 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 sed -i -e 's|lib/klibc|%{_lib}/klibc|g' hook-functions mkinitramfs +sed -i -e 's|INITRDDIR="/usr/lib/initrd"|INITRDDIR="/usr/%{_lib}/initrd"|' mkinitramfs %build @@ -148,6 +150,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.22 2010/01/20 16:47:06 baggins +- added support for initrd static programs + Revision 1.21 2010/01/20 15:07:09 baggins - rel 1 - fixed klibc lib dir ================================================================ Index: packages/initramfs-tools/initramfs-tools-initrdtools.patch diff -u /dev/null packages/initramfs-tools/initramfs-tools-initrdtools.patch:1.1 --- /dev/null Wed Jan 20 17:47:12 2010 +++ packages/initramfs-tools/initramfs-tools-initrdtools.patch Wed Jan 20 17:47:06 2010 @@ -0,0 +1,55 @@ +--- initramfs-tools/conf/initramfs.conf~ 2009-03-19 21:16:14.000000000 +0100 ++++ initramfs-tools/conf/initramfs.conf 2010-01-20 17:29:01.818021234 +0100 +@@ -28,6 +28,14 @@ + BUSYBOX=y + + # ++# INITRDTOOLS: [ y | n ] ++# ++# Use dedicated programs for init(rd|ramfs) usage if available ++# ++ ++INITRDTOOLS=y ++ ++# + # KEYMAP: [ y | n ] + # + # Load a keymap during the initramfs stage. +--- initramfs-tools/mkinitramfs~ 2010-01-20 16:06:15.393838115 +0100 ++++ initramfs-tools/mkinitramfs 2010-01-20 17:43:06.685958668 +0100 +@@ -10,6 +10,7 @@ + errors_to="2>/dev/null" + # BUSYBOXDIR="/usr/lib/initramfs-tools/bin/" + BUSYBOXDIR="/bin" ++INITRDDIR="/usr/lib/initrd" + + OPTIONS=`getopt -o d:ko:r:v -n "$0" -- "$@"` + +@@ -153,6 +154,7 @@ + export verbose + export KEYMAP + export MODULES ++export INITRDDIR + + # Private, used by 'catenate_cpiogz'. + export __TMPCPIOGZ +--- initramfs-tools/hook-functions~ 2010-01-20 16:06:15.392838170 +0100 ++++ initramfs-tools/hook-functions 2010-01-20 17:44:33.865833165 +0100 +@@ -119,6 +119,17 @@ + local libname dirname + + source="${1}" ++ if [ "${INITRDTOOLS}" = "y" ] || [ "${INITRDTOOLS}" = "Y" ]; then ++ x="$source" ++ while [[ "$x" = */* ]]; do ++ [ -e "${INITRDDIR}/${x}" ] && break ++ x=${x#*/} ++ done ++ if [ -e "${INITRDDIR}/${x}" ]; then ++ source="${INITRDDIR}/${x}" ++ fi ++ fi ++ + if [ -n "${2}" ]; then + target="${2}" + else ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/initramfs-tools/initramfs-tools.spec?r1=1.21&r2=1.22&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
