Author: baggins Date: Wed Jan 20 14:58:24 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 0.93.4
---- Files affected:
packages/initramfs-tools:
initramfs-tools-gz-modules.patch (1.2 -> 1.3) , initramfs-tools-nobb.patch
(1.1 -> 1.2) , initramfs-tools-undebianize.patch (1.1 -> 1.2) ,
initramfs-tools.spec (1.19 -> 1.20)
---- Diffs:
================================================================
Index: packages/initramfs-tools/initramfs-tools-gz-modules.patch
diff -u packages/initramfs-tools/initramfs-tools-gz-modules.patch:1.2
packages/initramfs-tools/initramfs-tools-gz-modules.patch:1.3
--- packages/initramfs-tools/initramfs-tools-gz-modules.patch:1.2 Tue Feb
24 16:34:25 2009
+++ packages/initramfs-tools/initramfs-tools-gz-modules.patch Wed Jan 20
15:58:18 2010
@@ -9,15 +9,16 @@
for mam_x in $(/sbin/modprobe --set-version="${version}"
--ignore-install \
--show-depends "${1}" 2>/dev/null | awk '/^insmod/ { print $2 }'); do
-@@ -68,12 +68,14 @@
+@@ -68,13 +68,15 @@
# 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}" ]; then
-- if grep -q "^$(basename "${mam_x}" .ko)" \
-+ if grep -q "^${mam_xbn}" \
+ 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}" \
================================================================
Index: packages/initramfs-tools/initramfs-tools-nobb.patch
diff -u packages/initramfs-tools/initramfs-tools-nobb.patch:1.1
packages/initramfs-tools/initramfs-tools-nobb.patch:1.2
--- packages/initramfs-tools/initramfs-tools-nobb.patch:1.1 Mon Feb 23
17:16:23 2009
+++ packages/initramfs-tools/initramfs-tools-nobb.patch Wed Jan 20 15:58:18 2010
@@ -120,13 +120,13 @@
--- 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 @@
- esac
if [ -n "${FB}" ]; then
-- modprobe fbcon
-- modprobe ${FB} ${OPTS}
-+ /sbin/modprobe fbcon
-+ /sbin/modprobe ${FB} ${OPTS}
+ unset MODPROBE_OPTIONS
+- modprobe -q fbcon
+- modprobe -q ${FB} ${OPTS}
++ /sbin/modprobe -q fbcon
++ /sbin/modprobe -q ${FB} ${OPTS}
fi
if [ -e /proc/fb ]; then
================================================================
Index: packages/initramfs-tools/initramfs-tools-undebianize.patch
diff -u packages/initramfs-tools/initramfs-tools-undebianize.patch:1.1
packages/initramfs-tools/initramfs-tools-undebianize.patch:1.2
--- packages/initramfs-tools/initramfs-tools-undebianize.patch:1.1 Sun Feb
22 19:32:01 2009
+++ packages/initramfs-tools/initramfs-tools-undebianize.patch Wed Jan 20
15:58:18 2010
@@ -1,19 +1,17 @@
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
-@@ -445,13 +445,13 @@
+@@ -445,12 +445,12 @@
# minimal supported kernel version
check_minkver()
{
- local curversion initdir DPKG_ARCH minversion cm_x tmp
-+ local curversion initdir ARCH minversion cm_x tmp
++ local curversion initdir minversion cm_x tmp
curversion="${1}"
initdir="${2}"
if [ -z "${initdir}" ]; then
-- DPKG_ARCH=$(dpkg --print-installation-architecture)
- case ${DPKG_ARCH} in
-+ ARCH=$(uname -m)
+ case ${ARCH} in
ia64|hppa)
minversion="2.6.15"
@@ -119,7 +117,7 @@
DESTDIR="$(mktemp -t -d mkinitramfs_XXXXXX)" || exit 1
__TMPCPIOGZ="$(mktemp -t mkinitramfs-OL_XXXXXX)" || exit 1
--DPKG_ARCH=`dpkg --print-installation-architecture`
+-DPKG_ARCH=`dpkg --print-architecture`
+ARCH=`uname -m`
# Export environment for hook scripts.
================================================================
Index: packages/initramfs-tools/initramfs-tools.spec
diff -u packages/initramfs-tools/initramfs-tools.spec:1.19
packages/initramfs-tools/initramfs-tools.spec:1.20
--- packages/initramfs-tools/initramfs-tools.spec:1.19 Thu Jun 4 15:01:42 2009
+++ packages/initramfs-tools/initramfs-tools.spec Wed Jan 20 15:58:18 2010
@@ -8,12 +8,12 @@
Summary: Tools for generating an initramfs
Summary(pl.UTF-8): Narzędzia do tworzenia initramfs
Name: initramfs-tools
-Version: 0.93
-Release: 2
+Version: 0.93.4
+Release: 0.1
License: Public Domain
Group: Applications/System
Source0:
http://ftp.de.debian.org/debian/pool/main/i/initramfs-tools/%{name}_%{version}.tar.gz
-# Source0-md5: 97b6188728c9ecacd21e9b4f06a3e86a
+# Source0-md5: 06415435a4ba85713ea50b34e212d73c
Patch0: %{name}-undebianize.patch
Patch1: %{name}-nobb.patch
Patch2: %{name}-gz-modules.patch
@@ -65,7 +65,7 @@
wbudowany ratunkowy shell do którego można zalogować się przez ssh.
%prep
-%setup -q
+%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -146,6 +146,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2010/01/20 14:58:18 baggins
+- updated to 0.93.4
+
Revision 1.19 2009/06/04 13:01:42 baggins
- rel 2
- explicit R ldd and locale in place of glibc-misc
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/initramfs-tools/initramfs-tools-gz-modules.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/initramfs-tools/initramfs-tools-nobb.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/initramfs-tools/initramfs-tools-undebianize.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/initramfs-tools/initramfs-tools.spec?r1=1.19&r2=1.20&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
