Hello community,

here is the log from the commit of package mkinitrd for openSUSE:Factory 
checked in at 2012-11-02 15:12:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-19 
08:47:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes   2012-11-02 
15:12:15.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov  2 10:39:06 UTC 2012 - idon...@suse.com
+
+- Add mkinitrd-get_kernel_version.patch to fix path for
+  get_kernel_version command.
+
+-------------------------------------------------------------------

New:
----
  mkinitrd-get_kernel_version.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.E2Sxad/_old  2012-11-02 15:12:16.000000000 +0100
+++ /var/tmp/diff_new_pack.E2Sxad/_new  2012-11-02 15:12:16.000000000 +0100
@@ -55,6 +55,8 @@
 Patch0:         0001-Handle-lib-udev-being-a-symlink-to-usr-lib-udev.patch
 # PATCH-FIX-UPSTREAM mkinitrd-2.7.1-cmdinitrd.patch wer...@suse.com -- add 
cmdinitrd to run commands on files in an initrd
 Patch1:         mkinitrd-2.7.1-cmdinitrd.patch
+# Hack for 12.3-M1
+Patch2:         mkinitrd-get_kernel_version.patch
 # Note: the whole package is maintained in this git repository, please
 # don't change it in the build service without sending the author a
 # pull request or patch first. Otherwise, you risk that your changes will be
@@ -91,6 +93,7 @@
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c

++++++ mkinitrd-get_kernel_version.patch ++++++
Index: mkinitrd-2.7.1/sbin/mkinitrd
===================================================================
--- mkinitrd-2.7.1.orig/sbin/mkinitrd
+++ mkinitrd-2.7.1/sbin/mkinitrd
@@ -144,10 +144,10 @@ EOF
 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
+    if /usr/bin/get_kernel_version "$kernel_image" 2>/dev/null; then
         return
     fi
-    /sbin/get_kernel_version "$kernel_image_gz" 2>/dev/null
+    /usr/bin/get_kernel_version "$kernel_image_gz" 2>/dev/null
 }
 
 default_kernel_images() {
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to