Author: baggins Date: Thu Jan 21 00:00:21 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - cleanup after patching (we do cp -a *) - fix klibc location
---- Files affected: packages/initramfs-tools: initramfs-tools.spec (1.23 -> 1.24) , initramfs-tools-klibcdir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/initramfs-tools/initramfs-tools.spec diff -u packages/initramfs-tools/initramfs-tools.spec:1.23 packages/initramfs-tools/initramfs-tools.spec:1.24 --- packages/initramfs-tools/initramfs-tools.spec:1.23 Wed Jan 20 23:45:03 2010 +++ packages/initramfs-tools/initramfs-tools.spec Thu Jan 21 01:00:15 2010 @@ -8,7 +8,7 @@ Summary(pl.UTF-8): Narzędzia do tworzenia initramfs Name: initramfs-tools Version: 0.93.4 -Release: 2 +Release: 3 License: Public Domain Group: Applications/System Source0: http://ftp.de.debian.org/debian/pool/main/i/initramfs-tools/%{name}_%{version}.tar.gz @@ -18,6 +18,7 @@ Patch2: %{name}-gz-modules.patch Patch3: %{name}-less-noise.patch Patch4: %{name}-initrdtools.patch +Patch5: %{name}-klibcdir.patch URL: http://git.debian.org/?p=kernel/initramfs-tools.git;a=shortlog Requires: /usr/bin/ldd Requires: /usr/bin/locale @@ -71,10 +72,14 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 -sed -i -e 's|lib/klibc|%{_lib}/klibc|g' hook-functions mkinitramfs +sed -i -e 's|__KLIBCDIR__|%{_lib}|g' hook-functions mkinitramfs sed -i -e 's|INITRDDIR="/usr/lib/initrd"|INITRDDIR="/usr/%{_lib}/initrd"|' mkinitramfs +# cleanup backups after patching +find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f + %build %install @@ -150,6 +155,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.24 2010/01/21 00:00:15 baggins +- rel 3 +- cleanup after patching (we do cp -a *) +- fix klibc location + Revision 1.23 2010/01/20 22:45:03 baggins - rel 2 ================================================================ Index: packages/initramfs-tools/initramfs-tools-klibcdir.patch diff -u /dev/null packages/initramfs-tools/initramfs-tools-klibcdir.patch:1.1 --- /dev/null Thu Jan 21 01:00:21 2010 +++ packages/initramfs-tools/initramfs-tools-klibcdir.patch Thu Jan 21 01:00:15 2010 @@ -0,0 +1,25 @@ +--- initramfs-tools/mkinitramfs~ 2010-01-20 23:44:06.735249166 +0100 ++++ initramfs-tools/mkinitramfs 2010-01-21 00:49:57.218999728 +0100 +@@ -202,8 +202,9 @@ + # symlinks. + + # klibc +-ln -s /usr/lib/klibc/bin/* ${DESTDIR}/bin +-ln -s /lib/klibc-*.so ${DESTDIR}/lib ++mkdir -p ${DESTDIR}/__KLIBCDIR__ ++ln -s /usr/__KLIBCDIR__/klibc/bin/* ${DESTDIR}/bin ++ln -s /__KLIBCDIR__/klibc-*.so ${DESTDIR}/__KLIBCDIR__ + rm -f ${DESTDIR}/bin/kinit* ${DESTDIR}/bin/gzip + + cp -p /usr/share/initramfs-tools/init ${DESTDIR}/init +--- initramfs-tools/hook-functions~ 2010-01-20 23:44:06.730248164 +0100 ++++ initramfs-tools/hook-functions 2010-01-21 00:50:47.980252380 +0100 +@@ -260,7 +260,7 @@ + + # find out real rootfs on auto type + if [ "${FSTYPE}" = "auto" ]; then +- eval "$(/usr/lib/klibc/bin/fstype ${root})" ++ eval "$(/usr/__KLIBCDIR__/klibc/bin/fstype ${root})" + fi + + # check that fstype rootfs recognition ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/initramfs-tools/initramfs-tools.spec?r1=1.23&r2=1.24&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
