[packages/initramfs-tools] - sync to 0.114; needs testing if anyone still uses it
qboosh
qboosh at pld-linux.org
Sun Oct 20 21:56:52 CEST 2013
commit 6475d2505752c887e7def5f14c799edc98e88d80
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Oct 20 21:56:16 2013 +0200
- sync to 0.114; needs testing if anyone still uses it
initramfs-tools-gz-modules.patch | 65 +++++-----------
initramfs-tools-initrdtools.patch | 45 +++++-------
initramfs-tools-klibcdir.patch | 41 +++++------
initramfs-tools-less-noise.patch | 19 ++---
initramfs-tools-nobb.patch | 137 +++++++++++++---------------------
initramfs-tools-undebianize.patch | 151 +++++++++++---------------------------
initramfs-tools.spec | 22 +++---
7 files changed, 172 insertions(+), 308 deletions(-)
---
diff --git a/initramfs-tools.spec b/initramfs-tools.spec
index 4876690..f6023e5 100644
--- a/initramfs-tools.spec
+++ b/initramfs-tools.spec
@@ -1,17 +1,18 @@
#
# TODO:
+# - check after 0.93.x -> 0.114 update
# - clean up Requires (still)
# - 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: 6
+Version: 0.114
+Release: 0.1
License: Public Domain
Group: Applications/System
Source0: ftp://ftp.debian.org/debian/pool/main/i/initramfs-tools/%{name}_%{version}.tar.gz
-# Source0-md5: 06415435a4ba85713ea50b34e212d73c
+# Source0-md5: d335922c64ab829c7f1692d15fe09dcb
Patch0: %{name}-undebianize.patch
Patch1: %{name}-nobb.patch
Patch2: %{name}-gz-modules.patch
@@ -86,7 +87,7 @@ wbudowany ratunkowy shell do którego można zalogować się przez ssh.
%patch5 -p1
%patch6 -p1
-sed -i -e 's|__KLIBCDIR__|%{_lib}|g' hook-functions mkinitramfs
+sed -i -e 's|__KLIBCDIR__|%{_lib}|g' hooks/klibc
sed -i -e 's|INITRDDIR="/usr/lib/initrd"|INITRDDIR="/usr/%{_lib}/initrd"|' mkinitramfs
# cleanup backups after patching
@@ -116,7 +117,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc HACKING docs/*
+%doc HACKING docs/* debian/changelog
%dir %{_sysconfdir}/initramfs-tools
%dir %{_sysconfdir}/initramfs-tools/conf.d
%dir %{_sysconfdir}/initramfs-tools/hooks
@@ -143,7 +144,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/initramfs-tools/modules.d
%dir %{_datadir}/initramfs-tools/scripts
%dir %{_datadir}/initramfs-tools/scripts/init-bottom
-%dir %{_datadir}/initramfs-tools/scripts/init-premount
%dir %{_datadir}/initramfs-tools/scripts/init-top
%dir %{_datadir}/initramfs-tools/scripts/local-bottom
%dir %{_datadir}/initramfs-tools/scripts/local-premount
@@ -154,9 +154,13 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/initramfs-tools/scripts/functions
%{_datadir}/initramfs-tools/scripts/local
%{_datadir}/initramfs-tools/scripts/nfs
-%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/init-premount/*
%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/init-top/*
%attr(755,root,root) %{_datadir}/initramfs-tools/scripts/local-premount/*
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/mkinitramfs
+%attr(755,root,root) %{_sbindir}/update-initramfs
%dir /var/lib/initramfs-tools
-%{_mandir}/man[58]/*
+%{_mandir}/man5/initramfs.conf.5*
+%{_mandir}/man5/update-initramfs.conf.5*
+%{_mandir}/man8/initramfs-tools.8*
+%{_mandir}/man8/mkinitramfs.8*
+%{_mandir}/man8/update-initramfs.8*
diff --git a/initramfs-tools-gz-modules.patch b/initramfs-tools-gz-modules.patch
index b1ffa34..074c0e9 100644
--- a/initramfs-tools-gz-modules.patch
+++ b/initramfs-tools-gz-modules.patch
@@ -1,52 +1,25 @@
---- initramfs-tools-0.93/hook-functions.orig 2009-02-23 17:16:46.000000000 +0100
-+++ initramfs-tools-0.93/hook-functions 2009-02-24 16:33:40.000000000 +0100
-@@ -41,7 +41,7 @@
- # Add dependent modules + eventual firmware
- manual_add_modules()
- {
-- local mam_x firmwares firmware
-+ local mam_x mam_xbn firmwares firmware
-
- for mam_x in $(/sbin/modprobe --set-version="${version}" --ignore-install \
- --show-depends "${1}" 2>/dev/null | awk '/^insmod/ { print $2 }'); do
-@@ -68,13 +68,15 @@
+--- initramfs-tools/hook-functions.orig 2013-10-20 20:07:37.766039986 +0200
++++ initramfs-tools/hook-functions 2013-10-20 20:24:00.679332070 +0200
+@@ -93,9 +93,9 @@
+ fi
- # Only print warning for missing fw of loaded module
- # or forced loaded module
-+ mam_xbn=$(basename "${mam_x}" .ko)
-+ mam_xbn=${mam_xbn%%.ko*}
- if [ ! -e "/lib/firmware/${firmware}" ] \
- && [ ! -e "/lib/firmware/${version}/${firmware}" ]; then
-- if grep -q "^$(basename "${mam_x}" .ko)[[:space:]]" \
-+ if grep -q "^${mam_xbn}[[:space:]]" \
- /proc/modules \
-- || grep -q "^$(basename "${mam_x}" .ko)" \
-+ || grep -q "^${mam_xbn}" \
- "${CONFDIR}/modules"; then
-- echo "W: Possible missing firmware /lib/firmware/${firmware} for module $(basename ${mam_x} .ko)" >&2
-+ echo "W: Possible missing firmware /lib/firmware/${firmware} for module ${mam_xbn}" >&2
+ kmod_modname="${kmod##*/}"
+- kmod_modname="${kmod_modname%.ko}"
++ kmod_modname="${kmod_modname%.ko*}"
+ if grep -q "^$kmod_modname\\>" /proc/modules "${CONFDIR}/modules"; then
+- echo "W: Possible missing firmware /lib/firmware/${firmware} for module $(basename ${kmod} .ko)" >&2
++ echo "W: Possible missing firmware /lib/firmware/${firmware} for module $kmod_modname" >&2
fi
continue
fi
-@@ -169,7 +171,7 @@
- # Copy entire subtrees to the initramfs
- copy_modules_dir()
- {
-- local x_mod
-+ local x_mod mod_bn
-
- if ! [ -d "${MODULESDIR}/${1}" ]; then
- return;
-@@ -177,8 +179,10 @@
- if [ "${verbose}" = "y" ]; then
- echo "Copying module directory ${1}"
- fi
-- for x_mod in $(find "${MODULESDIR}/${1}" -name '*.ko' -print); do
-- manual_add_modules $(basename ${x_mod} .ko)
-+ for x_mod in $(find "${MODULESDIR}/${1}" \( -name '*.ko' -o -name '*.ko.gz' \) -print); do
-+ mod_bn=$(basename "${x_mod}" .ko)
-+ mod_bn=${mod_bn%%.ko*}
-+ manual_add_modules ${mod_bn}
+@@ -187,8 +187,8 @@
+ exclude="${exclude:-} -name $1 -prune -o "
+ shift
done
+- for kmod in $(find "${MODULESDIR}/${dir}" ${exclude:-} -name '*.ko' -printf '%f\n'); do
+- modules="$modules ${kmod%.ko}"
++ for kmod in $(find "${MODULESDIR}/${dir}" ${exclude:-} \( -name '*.ko' -o -name '*.ko.gz' \) -printf '%f\n'); do
++ modules="$modules ${kmod%.ko*}"
+ done
+ manual_add_modules $modules
}
-
diff --git a/initramfs-tools-initrdtools.patch b/initramfs-tools-initrdtools.patch
index 0d02f8c..42a3a55 100644
--- a/initramfs-tools-initrdtools.patch
+++ b/initramfs-tools-initrdtools.patch
@@ -15,51 +15,42 @@
# 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
+--- initramfs-tools/mkinitramfs.orig 2013-10-20 20:28:07.915988361 +0200
++++ initramfs-tools/mkinitramfs 2013-10-20 20:37:00.889299328 +0200
@@ -10,6 +10,7 @@
- errors_to="2>/dev/null"
- # BUSYBOXDIR="/usr/lib/initramfs-tools/bin/"
- BUSYBOXDIR="/bin"
+ test -e /bin/busybox && BUSYBOXDIR=/bin
+ test -e /usr/lib/initramfs-tools/bin/busybox && BUSYBOXDIR=/usr/lib/initramfs-tools/bin
+ export BUSYBOXDIR
+INITRDDIR="/usr/lib/initrd"
- OPTIONS=`getopt -o d:ko:r:v -n "$0" -- "$@"`
+ OPTIONS=`getopt -o c:d:ko:r:v -n "$0" -- "$@"`
-@@ -153,6 +154,8 @@
- export verbose
+@@ -190,6 +191,8 @@
export KEYMAP
export MODULES
+ export BUSYBOX
+export INITRDDIR
+export INITRDTOOLS
# Private, used by 'catenate_cpiogz'.
export __TMPCPIOGZ
-@@ -251,7 +251,7 @@
- rm -f ${DESTDIR}/bin/sh
- rm -f ${DESTDIR}/bin/busybox
- copy_exec ${BUSYBOXDIR}/busybox /bin/busybox
-- ln -s ${BUSYBOXDIR}/busybox ${DESTDIR}/bin/sh
-+ copy_exec ${BUSYBOXDIR}/busybox /bin/sh
- fi
+--- initramfs-tools/hook-functions.orig 2013-10-20 20:38:05.389296621 +0200
++++ initramfs-tools/hook-functions 2013-10-20 20:40:48.235956453 +0200
+@@ -123,6 +123,17 @@
+ src="${1}"
+ target="${2:-$1}"
- # Modutils
---- 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"
++ x="$src"
+ while [[ "$x" = */* ]]; do
+ [ -e "${INITRDDIR}/${x}" ] && break
+ x=${x#*/}
+ done
+ if [ -e "${INITRDDIR}/${x}" ]; then
-+ source="${INITRDDIR}/${x}"
++ src="${INITRDDIR}/${x}"
+ fi
+ fi
+
- if [ -n "${2}" ]; then
- target="${2}"
- else
+ [ -f "${src}" ] || return 1
+
+ if [ -d "${DESTDIR}/${target}" ]; then
diff --git a/initramfs-tools-klibcdir.patch b/initramfs-tools-klibcdir.patch
index 940dd3c..1f31e13 100644
--- a/initramfs-tools-klibcdir.patch
+++ b/initramfs-tools-klibcdir.patch
@@ -1,25 +1,24 @@
---- 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.
+--- initramfs-tools/hooks/klibc.orig 2013-09-12 15:20:05.000000000 +0200
++++ initramfs-tools/hooks/klibc 2013-10-20 20:54:57.609254142 +0200
+@@ -16,16 +16,17 @@
+ esac
# klibc
--ln -s /usr/lib/klibc/bin/* ${DESTDIR}/bin
--ln -s /lib/klibc-*.so ${DESTDIR}/lib
+-cp -pnL /usr/lib/klibc/bin/* ${DESTDIR}/bin
+-cp -pL /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})"
++cp -pnL /usr/__KLIBCDIR__/klibc/bin/* ${DESTDIR}/bin
++cp -pL /__KLIBCDIR__/klibc-*.so ${DESTDIR}/__KLIBCDIR__
+ rm -f ${DESTDIR}/bin/kinit* ${DESTDIR}/bin/zcat
+ if [ "${BUSYBOX}" = "n" ] || [ ! -e ${BUSYBOXDIR}/busybox ]; 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
++ elif [ -e /usr/__KLIBCDIR__/klibc/bin/sh ]; then
+ # Others build a static version instead:
+- cp -pL /usr/lib/klibc/bin/sh ${DESTDIR}/bin/sh
++ cp -pL /usr/__KLIBCDIR__/klibc/bin/sh ${DESTDIR}/bin/sh
fi
-
- # check that fstype rootfs recognition
+ else
+ # Nobody wanted it, so save a tiny bit of space:
diff --git a/initramfs-tools-less-noise.patch b/initramfs-tools-less-noise.patch
index fc1fd2f..5f80b8b 100644
--- a/initramfs-tools-less-noise.patch
+++ b/initramfs-tools-less-noise.patch
@@ -1,18 +1,15 @@
---- initramfs-tools-0.93/scripts/functions~ 2009-02-27 20:05:45.000000000 +0100
-+++ initramfs-tools-0.93/scripts/functions 2009-02-27 20:09:26.000000000 +0100
-@@ -26,7 +26,7 @@
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "TEXT $@"
- fi
+--- initramfs-tools/scripts/functions.orig 2013-10-20 20:24:44.509330231 +0200
++++ initramfs-tools/scripts/functions 2013-10-20 20:26:58.035991294 +0200
+@@ -23,12 +23,11 @@
+
+ log_begin_msg()
+ {
- _log_msg "Begin: $@ ... "
-+ _log_msg "$@ ...\n"
++ _log_msg "$@ ... "
}
log_end_msg()
-@@ -34,7 +34,6 @@
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "SUCCESS ok"
- fi
+ {
- _log_msg "done.\n"
}
diff --git a/initramfs-tools-nobb.patch b/initramfs-tools-nobb.patch
index 9501c88..87d4d55 100644
--- a/initramfs-tools-nobb.patch
+++ b/initramfs-tools-nobb.patch
@@ -1,27 +1,14 @@
-diff -ur initramfs-tools-0.93/hook-functions initramfs-tools-0.93-nobb/hook-functions
---- initramfs-tools-0.93/hook-functions 2009-02-23 17:10:14.000000000 +0100
-+++ initramfs-tools-0.93-nobb/hook-functions 2009-02-23 17:12:20.000000000 +0100
-@@ -43,7 +43,7 @@
- {
- local mam_x firmwares firmware
-
-- for mam_x in $(modprobe --set-version="${version}" --ignore-install \
-+ for mam_x in $(/sbin/modprobe --set-version="${version}" --ignore-install \
- --show-depends "${1}" 2>/dev/null | awk '/^insmod/ { print $2 }'); do
- # Prune duplicates
- if [ -e "${DESTDIR}/${mam_x}" ]; then
-diff -ur initramfs-tools-0.93/init initramfs-tools-0.93-nobb/init
---- initramfs-tools-0.93/init 2009-02-23 17:10:14.000000000 +0100
-+++ initramfs-tools-0.93-nobb/init 2009-02-23 17:10:57.000000000 +0100
-@@ -177,7 +177,7 @@
- export noresume
- fi
-
--depmod -a
-+/sbin/depmod -a
- maybe_break top
+--- initramfs-tools/hook-functions.orig 2013-10-20 19:18:52.279496090 +0200
++++ initramfs-tools/hook-functions 2013-10-20 19:57:25.009399034 +0200
+@@ -59,7 +59,7 @@
+ return
+ fi
- # Don't do log messages here to avoid confusing usplash
+- modprobe --all --set-version="${version}" --ignore-install --quiet --show-depends "$@" |
++ /sbin/modprobe --all --set-version="${version}" --ignore-install --quiet --show-depends "$@" |
+ while read prefix kmod options ; do
+ if [ "${prefix}" != "insmod" ]; then
+ continue
diff -ur initramfs-tools-0.93/mkinitramfs initramfs-tools-0.93-nobb/mkinitramfs
--- initramfs-tools-0.93/mkinitramfs 2009-02-23 17:10:14.000000000 +0100
+++ initramfs-tools-0.93-nobb/mkinitramfs 2009-02-23 17:11:07.000000000 +0100
@@ -34,21 +21,32 @@ diff -ur initramfs-tools-0.93/mkinitramfs initramfs-tools-0.93-nobb/mkinitramfs
fi
DESTDIR="$(mktemp -t -d mkinitramfs_XXXXXX)" || exit 1
-diff -ur initramfs-tools-0.93/scripts/functions initramfs-tools-0.93-nobb/scripts/functions
---- initramfs-tools-0.93/scripts/functions 2009-01-07 15:14:37.000000000 +0100
-+++ initramfs-tools-0.93-nobb/scripts/functions 2009-02-23 17:13:03.000000000 +0100
-@@ -47,8 +47,8 @@
+--- initramfs-tools/scripts/functions.orig 2013-09-12 14:39:58.000000000 +0200
++++ initramfs-tools/scripts/functions 2013-10-20 19:59:34.126060282 +0200
+@@ -44,14 +44,14 @@
sleep ${panic}
reboot
fi
-- modprobe i8042
-- modprobe atkbd
-+ /sbin/modprobe i8042
-+ /sbin/modprobe atkbd
- echo $@
- PS1='(initramfs) ' /bin/sh -i </dev/console >/dev/console 2>&1
+- modprobe -v i8042 || true
+- modprobe -v atkbd || true
+- modprobe -v ehci-pci || true
+- modprobe -v ehci-orion || true
+- modprobe -v ehci-hcd || true
+- modprobe -v uhci-hcd || true
+- modprobe -v ohci-hcd || true
+- modprobe -v usbhid || true
++ /sbin/modprobe -v i8042 || true
++ /sbin/modprobe -v atkbd || true
++ /sbin/modprobe -v ehci-pci || true
++ /sbin/modprobe -v ehci-orion || true
++ /sbin/modprobe -v ehci-hcd || true
++ /sbin/modprobe -v uhci-hcd || true
++ /sbin/modprobe -v ohci-hcd || true
++ /sbin/modprobe -v usbhid || true
+ REASON="$@" PS1='(initramfs) ' /bin/sh -i </dev/console >/dev/console 2>&1
}
-@@ -224,7 +224,7 @@
+
+@@ -261,7 +261,7 @@
if [ "$com" = "#" ]; then
continue
fi
@@ -57,69 +55,34 @@ diff -ur initramfs-tools-0.93/scripts/functions initramfs-tools-0.93-nobb/script
done
fi
}
-diff -ur initramfs-tools-0.93/scripts/init-premount/thermal initramfs-tools-0.93-nobb/scripts/init-premount/thermal
---- initramfs-tools-0.93/scripts/init-premount/thermal 2009-02-23 17:10:14.000000000 +0100
-+++ initramfs-tools-0.93-nobb/scripts/init-premount/thermal 2009-02-23 17:14:07.000000000 +0100
-@@ -18,17 +18,17 @@
- case "$ARCH" in
- # load the right modules
- powerpc|ppc64)
-- modprobe i2c-powermac
-- modprobe therm_pm72
-- modprobe windfarm_cpufreq_clamp
-- modprobe windfarm_lm75_sensor
-- modprobe windfarm_max6690_sensor
-- modprobe windfarm_pm112
-- modprobe windfarm_pm81
-- modprobe windfarm_pm91
-- modprobe windfarm_smu_controls
-- modprobe windfarm_smu_sat
-- modprobe windfarm_smu_sensors
-+ /sbin/modprobe i2c-powermac
-+ /sbin/modprobe therm_pm72
-+ /sbin/modprobe windfarm_cpufreq_clamp
-+ /sbin/modprobe windfarm_lm75_sensor
-+ /sbin/modprobe windfarm_max6690_sensor
-+ /sbin/modprobe windfarm_pm112
-+ /sbin/modprobe windfarm_pm81
-+ /sbin/modprobe windfarm_pm91
-+ /sbin/modprobe windfarm_smu_controls
-+ /sbin/modprobe windfarm_smu_sat
-+ /sbin/modprobe windfarm_smu_sensors
- ;;
- i?86|athlon|amd64|x86?64|ia64)
- for x in $(cat /proc/cmdline); do
-@@ -38,7 +38,7 @@
- ;;
- esac
- done
-- modprobe fan
-- modprobe thermal
-+ /sbin/modprobe fan
-+ /sbin/modprobe thermal
- ;;
- esac
-diff -ur initramfs-tools-0.93/scripts/init-top/all_generic_ide initramfs-tools-0.93-nobb/scripts/init-top/all_generic_ide
---- initramfs-tools-0.93/scripts/init-top/all_generic_ide 2008-12-18 00:45:21.000000000 +0100
-+++ initramfs-tools-0.93-nobb/scripts/init-top/all_generic_ide 2009-02-23 17:14:15.000000000 +0100
+--- initramfs-tools/scripts/init-top/all_generic_ide.orig 2013-10-20 20:00:29.019391312 +0200
++++ initramfs-tools/scripts/init-top/all_generic_ide 2013-10-20 20:04:39.002714154 +0200
@@ -16,11 +16,11 @@
for x in $(cat /proc/cmdline); do
case ${x} in
all_generic_ide)
-- modprobe ide-generic
-+ /sbin/modprobe ide-generic
+- modprobe ata_generic all_generic_ide=1
++ /sbin/modprobe ata_generic all_generic_ide=1
;;
all_generic_ide=*)
if [ ${x#all_generic_ide=} ]; then
-- modprobe ide-generic
-+ /sbin/modprobe ide-generic
+- modprobe ata_generic all_generic_ide=1
++ /sbin/modprobe ata_generic all_generic_ide=1
fi
;;
esac
-diff -ur initramfs-tools-0.93/scripts/init-top/framebuffer initramfs-tools-0.93-nobb/scripts/init-top/framebuffer
---- initramfs-tools-0.93/scripts/init-top/framebuffer 2008-12-15 11:31:06.000000000 +0100
-+++ initramfs-tools-0.93-nobb/scripts/init-top/framebuffer 2009-02-23 17:14:22.000000000 +0100
-@@ -87,8 +87,8 @@
+--- initramfs-tools/docs/framebuffer.orig 2013-07-23 19:19:27.000000000 +0200
++++ initramfs-tools/docs/framebuffer 2013-10-20 20:07:01.579374837 +0200
+@@ -85,7 +85,7 @@
+ ;;
+ intelfb|i810fb|i915)
+ # Needs AGP driver loaded
+- modprobe intel-agp
++ /sbin/modprobe intel-agp
+ ;;
+ uvesafb)
+ # v86d requires /dev/zero and dev/mem, but udev haven't been started yet
+@@ -98,8 +98,8 @@
if [ -n "${FB}" ]; then
unset MODPROBE_OPTIONS
diff --git a/initramfs-tools-undebianize.patch b/initramfs-tools-undebianize.patch
index 8f1724d..c9b2982 100644
--- a/initramfs-tools-undebianize.patch
+++ b/initramfs-tools-undebianize.patch
@@ -1,54 +1,3 @@
-diff -urN initramfs-tools-0.93.orig/hook-functions initramfs-tools-0.93/hook-functions
---- initramfs-tools-0.93.orig/hook-functions 2009-02-17 18:22:54.000000000 +0100
-+++ initramfs-tools-0.93/hook-functions 2009-02-22 19:18:13.000000000 +0100
-@@ -83,9 +83,9 @@
- continue
- fi
-
-- if [ ! -e "${DESTDIR}/lib/udev/firmware.agent" ] \
-- && [ -e "/lib/udev/firmware.agent" ]; then
-- copy_exec /lib/udev/firmware.agent
-+ if [ ! -e "${DESTDIR}/lib/udev/firmware" ] \
-+ && [ -e "/lib/udev/firmware" ]; then
-+ copy_exec /lib/udev/firmware
- fi
-
- if [ -e "/lib/firmware/${version}/${firmware}" ]; then
-@@ -445,12 +445,12 @@
- # minimal supported kernel version
- check_minkver()
- {
-- local curversion initdir DPKG_ARCH minversion cm_x tmp
-+ local curversion initdir minversion cm_x tmp
-
- curversion="${1}"
- initdir="${2}"
- if [ -z "${initdir}" ]; then
-- case ${DPKG_ARCH} in
-+ case ${ARCH} in
- ia64|hppa)
- minversion="2.6.15"
- ;;
-@@ -459,8 +459,8 @@
- minversion="2.6.12"
- ;;
- esac
-- if dpkg --compare-versions "${curversion}" lt "${minversion}"; then
-- echo "W: kernel ${curversion} too old for initramfs on ${DPKG_ARCH}" >&2
-+ if expr "${curversion}" '<' "${minversion}" >/dev/null 2>/dev/null; then
-+ echo "W: kernel ${curversion} too old for initramfs on ${ARCH}" >&2
- echo "W: not generating requested initramfs for kernel ${curversion}" >&2
- exit 2
- fi
-@@ -473,7 +473,7 @@
- minver=$(sed '/^MINKVER=/!d;$!d;s/^MINKVER=//;s/[[:space:]]*$//' "${initdir}/${cm_x}")
- if [ -z "${tmp}" ]; then
- continue
-- elif dpkg --compare-versions "${curversion}" lt "${minver}"; then
-+ elif expr "${curversion}" '<' "${minver}" >/dev/null 2>/dev/null; then
- 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
diff -urN initramfs-tools-0.93.orig/hooks/thermal initramfs-tools-0.93/hooks/thermal
--- initramfs-tools-0.93.orig/hooks/thermal 2007-12-25 17:03:57.000000000 +0100
+++ initramfs-tools-0.93/hooks/thermal 2009-02-22 18:35:32.000000000 +0100
@@ -114,28 +63,27 @@ diff -urN initramfs-tools-0.93.orig/initramfs-tools.8 initramfs-tools-0.93/initr
allows arch specific boot actions.
.TP
\fB\fI blacklist, panic, quiet, resume, noresume, resume_offset
-diff -urN initramfs-tools-0.93.orig/mkinitramfs initramfs-tools-0.93/mkinitramfs
---- initramfs-tools-0.93.orig/mkinitramfs 2009-02-17 15:56:33.000000000 +0100
-+++ initramfs-tools-0.93/mkinitramfs 2009-02-22 18:40:45.000000000 +0100
-@@ -63,7 +63,7 @@
+--- initramfs-tools/mkinitramfs.orig 2013-09-12 15:20:05.000000000 +0200
++++ initramfs-tools/mkinitramfs 2013-10-20 18:42:05.429588703 +0200
+@@ -67,7 +67,7 @@
EXTRA_CONF=''
for i in /usr/share/initramfs-tools/conf.d/* ${CONFDIR}/conf.d/*; do
- EXTRA_CONF="${EXTRA_CONF} $(basename $i \
+ [ -e $i ] && EXTRA_CONF="${EXTRA_CONF} $(basename $i \
- | grep '^[[:alnum:]][[:alnum:]\._-]*$' | grep -v '\.dpkg-.*$')";
-+ | grep '^[[:alnum:]][[:alnum:]\._-]*$' | grep -v '\.dpkg-.*$' | grep -v '\.rpm\(save\|new\|orig\)$')";
++ | grep '^[[:alnum:]][[:alnum:]\._-]*$' | grep -v '\.dpkg-.*$' | grep -Ev '\.rpm(save|new|orig)$')";
done
# FIXME: deprecated those settings on mkinitramfs run
- # these conf dirs are for boot scripts and land on initramfs
-@@ -141,7 +141,7 @@
- DESTDIR="$(mktemp -t -d mkinitramfs_XXXXXX)" || exit 1
- __TMPCPIOGZ="$(mktemp -t mkinitramfs-OL_XXXXXX)" || exit 1
+ # these conf dirs are for boot scripts and land on initramfs
+@@ -177,7 +177,7 @@
+ __TMPCPIOGZ="$(mktemp ${TMPDIR:-/var/tmp}/mkinitramfs-OL_XXXXXX)" || exit 1
+ __TMPEARLYCPIO="$(mktemp ${TMPDIR:-/var/tmp}/mkinitramfs-FW_XXXXXX)" || exit 1
-DPKG_ARCH=`dpkg --print-architecture`
+ARCH=`uname -m`
# Export environment for hook scripts.
#
-@@ -149,7 +149,7 @@
+@@ -185,7 +185,7 @@
export version
export CONFDIR
export DESTDIR
@@ -144,7 +92,7 @@ diff -urN initramfs-tools-0.93.orig/mkinitramfs initramfs-tools-0.93/mkinitramfs
export verbose
export KEYMAP
export MODULES
-@@ -215,7 +215,7 @@
+@@ -258,7 +258,7 @@
cp -p "${CONFDIR}/scripts/${b}" "${DESTDIR}/scripts/$(dirname "${b}")/"
done
@@ -153,7 +101,7 @@ diff -urN initramfs-tools-0.93.orig/mkinitramfs initramfs-tools-0.93/mkinitramfs
cp -p "${CONFDIR}/initramfs.conf" ${DESTDIR}/conf
for i in ${EXTRA_CONF}; do
if [ -e "${CONFDIR}/conf.d/${i}" ]; then
-@@ -253,7 +253,7 @@
+@@ -285,7 +285,7 @@
cp -a /etc/modprobe.d/* "${DESTDIR}/etc/modprobe.d/"
# workaround: libgcc always needed on old-abi arm
@@ -162,58 +110,47 @@ diff -urN initramfs-tools-0.93.orig/mkinitramfs initramfs-tools-0.93/mkinitramfs
cp -a /lib/libgcc_s.so.1 "${DESTDIR}/lib/"
fi
-diff -urN initramfs-tools-0.93.orig/scripts/init-premount/thermal initramfs-tools-0.93/scripts/init-premount/thermal
---- initramfs-tools-0.93.orig/scripts/init-premount/thermal 2009-02-13 17:20:58.000000000 +0100
-+++ initramfs-tools-0.93/scripts/init-premount/thermal 2009-02-22 18:34:46.000000000 +0100
-@@ -15,7 +15,7 @@
- ;;
- esac
-
--case "$DPKG_ARCH" in
-+case "$ARCH" in
- # load the right modules
- powerpc|ppc64)
- modprobe i2c-powermac
-@@ -30,7 +30,7 @@
- modprobe windfarm_smu_sat
- modprobe windfarm_smu_sensors
- ;;
--i386|amd64|ia64)
-+i?86|athlon|amd64|x86?64|ia64)
- for x in $(cat /proc/cmdline); do
- case ${x} in
- acpi=off)
-diff -urN initramfs-tools-0.93.orig/update-initramfs initramfs-tools-0.93/update-initramfs
---- initramfs-tools-0.93.orig/update-initramfs 2009-01-11 23:56:02.000000000 +0100
-+++ initramfs-tools-0.93/update-initramfs 2009-02-22 19:17:10.000000000 +0100
-@@ -4,7 +4,6 @@
+--- initramfs-tools/update-initramfs.orig 2013-07-23 19:19:27.000000000 +0200
++++ initramfs-tools/update-initramfs 2013-10-20 19:15:39.612837510 +0200
+@@ -3,7 +3,6 @@
+ STATEDIR=/var/lib/initramfs-tools
BOOTDIR=/boot
CONF=/etc/initramfs-tools/update-initramfs.conf
- KPKGCONF=/etc/kernel-img.conf
-USETRIGGERS=true
mode=""
version=""
-
-@@ -12,18 +11,6 @@
+ update_initramfs=yes
+@@ -13,29 +12,6 @@
[ -r ${CONF} ] && . ${CONF}
--if $USETRIGGERS \
-- && [ x"$DPKG_MAINTSCRIPT_PACKAGE" != x ] \
-- && [ $# = 1 ] \
-- && [ x"$1" = x-u ] \
-- && dpkg-trigger --check-supported 2>/dev/null
--then
-- if dpkg-trigger --no-await update-initramfs; then
-- echo "update-initramfs: deferring update (trigger activated)"
+-case "$DPKG_MAINTSCRIPT_PACKAGE" in
+-linux-image-*)
+- if [ -z "$INITRAMFS_TOOLS_KERNEL_HOOK" ]; then
+- # kernel maintainer script called us directly; ignore
+- # it and let the hook script handle it instead
+- echo "update-initramfs: deferring update (hook will be called later)"
- exit 0
- fi
--fi
+- ;;
+-?*)
+- if $USETRIGGERS \
+- && [ $# = 1 ] \
+- && [ x"$1" = x-u ] \
+- && dpkg-trigger --check-supported 2>/dev/null
+- then
+- if dpkg-trigger --no-await update-initramfs; then
+- echo "update-initramfs: deferring update (trigger activated)"
+- exit 0
+- fi
+- fi
+- ;;
+-esac
-
usage()
{
- if [ -n "${1}" ]; then
-@@ -98,7 +85,7 @@
+ if [ -n "${1:-}" ]; then
+@@ -110,7 +86,7 @@
backup_initramfs()
{
[ ! -r "${initramfs}" ] && return 0
@@ -222,7 +159,7 @@ diff -urN initramfs-tools-0.93.orig/update-initramfs initramfs-tools-0.93/update
[ -r "${initramfs_bak}" ] && rm -f "${initramfs_bak}"
ln -f "${initramfs}" "${initramfs_bak}" \
|| cp -a "${initramfs}" "${initramfs_bak}"
-@@ -108,7 +95,7 @@
+@@ -120,7 +96,7 @@
# keep booted initramfs
backup_booted_initramfs()
{
@@ -231,12 +168,12 @@ diff -urN initramfs-tools-0.93.orig/update-initramfs initramfs-tools-0.93/update
# first time run thus no backup
[ ! -r "${initramfs_bak}" ] && return 0
-@@ -313,7 +300,7 @@
+@@ -237,7 +213,7 @@
fi
worklist=""
for gsv_i in $version_list; do
-- if dpkg --compare-versions "${gsv_x}" '>' "${gsv_i}"; then
-+ if expr "${gsv_x}" '>' "${gsv_i}" >/dev/null 2>/dev/null; then
+- if dpkg --compare-versions "${gsv_x}" '>' "${gsv_i}" 2>/dev/null; then
++ if expr "${gsv_x}" '>' "${gsv_i}" >/dev/null 2>&1; then
worklist="${worklist} ${gsv_x} ${gsv_i}"
gsv_x=""
else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/initramfs-tools.git/commitdiff/6475d2505752c887e7def5f14c799edc98e88d80
More information about the pld-cvs-commit
mailing list