Hello community,
here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at 2012-02-17 12:06:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
and /work/SRC/openSUSE:Factory/.mkinitrd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkinitrd", Maintainer is "mma...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2012-02-14
11:25:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2012-02-17
12:06:15.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Feb 15 14:58:47 UTC 2012 - mma...@suse.cz
+
+- Simplify calling of get_kernel_version.
+
+-------------------------------------------------------------------
+Wed Feb 15 13:55:39 UTC 2012 - m...@suse.de
+
+- Add support for ARM uImages.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-02-09 12:19:05.000000000 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-02-15 15:59:39.000000000 +0100
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Wed Feb 15 14:58:47 UTC 2012 - mma...@suse.cz
+
+- Simplify calling of get_kernel_version.
+
+-------------------------------------------------------------------
+Wed Feb 15 13:55:39 UTC 2012 - m...@suse.de
+
+- Add support for ARM uImages.
+
+-------------------------------------------------------------------
Thu Feb 9 10:57:19 UTC 2012 - lchiqui...@suse.com
- Install /boot/vmlinux for self compiled kernels in the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/mkinitrd
new/mkinitrd-2.7.0/sbin/mkinitrd
--- old/mkinitrd-2.7.0/sbin/mkinitrd 2012-02-09 12:19:05.000000000 +0100
+++ new/mkinitrd-2.7.0/sbin/mkinitrd 2012-02-15 15:59:39.000000000 +0100
@@ -141,6 +141,15 @@
exit
}
+kernel_version_from_image() {
+ local kernel_image=$1 kernel_image_gz=${1//uImage/vmlinux}.gz
+
+ if /sbin/get_kernel_version "$kernel_image" 2>/dev/null; then
+ return
+ fi
+ /sbin/get_kernel_version "$kernel_image_gz" 2>/dev/null
+}
+
default_kernel_images() {
local regex kernel_image kernel_version version_version initrd_image
local qf='%{NAME}-%{VERSION}-%{RELEASE}\n'
@@ -155,6 +164,9 @@
i386|x86_64)
regex='vmlinuz'
;;
+ arm*)
+ regex='uImage'
+ ;;
*) regex='vmlinu.'
;;
esac
@@ -176,8 +188,7 @@
[ -L "/boot/$kernel_image" ] && continue
[ "${kernel_image%%.gz}" != "$kernel_image" ] && continue
- kernel_version=$(/sbin/get_kernel_version \
- /boot/$kernel_image 2> /dev/null)
+ kernel_version=$(kernel_version_from_image "/boot/$kernel_image")
initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|")
if [ "$kernel_image" != "$initrd_image" -a \
-n "$kernel_version" -a \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-done.sh
new/mkinitrd-2.7.0/scripts/setup-done.sh
--- old/mkinitrd-2.7.0/scripts/setup-done.sh 2012-02-09 12:19:05.000000000
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-done.sh 2012-02-15 15:59:39.000000000
+0100
@@ -17,6 +17,14 @@
then
oops 8 "Failed to build initrd"
fi
+
+arch=$(uname -i)
+if [[ $arch =~ arm ]];then
+ mkimage -A arm -O linux -T ramdisk -C none -a 0x0 -e 0x0 \
+ -n 'Initrd' -d $tmp_initrd $tmp_initrd.uboot
+ rm -f $tmp_initrd
+ tmp_initrd=$tmp_initrd.uboot
+fi
popd > /dev/null 2>&1
if ! cp -f $tmp_initrd $initrd_image ; then
oops 8 "Failed to install initrd"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-prepare.sh
new/mkinitrd-2.7.0/scripts/setup-prepare.sh
--- old/mkinitrd-2.7.0/scripts/setup-prepare.sh 2012-02-09 12:19:05.000000000
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-prepare.sh 2012-02-15 15:59:39.000000000
+0100
@@ -113,7 +113,7 @@
error 1 "No kernel image $kernel_image found"
fi
-kernel_version=$(/sbin/get_kernel_version $kernel_image)
+kernel_version=$(kernel_version_from_image $kernel_image)
modules_dir=$root_dir/lib/modules/$kernel_version
#echo -e "Kernel version:\t$kernel_version"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
