- added static-dev patch (don't force devtmpfs if udev is disabled in target system)

- added posix-sh patch (don't use non-POSIX ${ / / } extension)
- release 7

diff --git a/geninitrd-posix-sh.patch b/geninitrd-posix-sh.patch
new file mode 100644 (file)
index 0000000..5333823
--- /dev/null
+++ b/geninitrd-posix-sh.patch
@@ -0,0 +1,14 @@
+--- geninitrd-12757/functions.orig     2015-11-09 13:02:48.000000000 +0100
++++ geninitrd-12757/functions  2016-06-21 20:39:25.851674448 +0200
+@@ -303,9 +303,9 @@
+       '
+ }
+ 
+-# get possible paths for specifed patter containing LIBDIR
++# get possible paths for specifed pattern containing LIBDIR
+ get_libdir() {
+       for dir in lib lib64 libx32; do
+-              echo -n "${1/LIBDIR/$dir} "
++              echo -n "$1 " | sed -e "s,LIBDIR,${dir},g"
+       done
+ }

diff --git a/geninitrd-static-dev.patch b/geninitrd-static-dev.patch
new file mode 100644 (file)
index 0000000..32da77b
--- /dev/null
+++ b/geninitrd-static-dev.patch
@@ -0,0 +1,16 @@
+--- geninitrd-12757/geninitrd.orig     2016-06-21 17:52:10.293075494 +0200
++++ geninitrd-12757/geninitrd  2016-06-21 20:37:02.375785058 +0200
+@@ -293,8 +293,12 @@
+               run_mounted=no
+       fi
+       if is_yes "$dev_mounted"; then
++              if ! is_no "$START_UDEV"; then
++                      add_linuxrc <<-EOF
++                      mount --bind /dev /newroot/dev
++                      EOF
++              fi
+               add_linuxrc <<-EOF
+-              mount --bind /dev /newroot/dev
+               umount /dev
+               EOF
+               dev_mounted=no

diff --git a/geninitrd.spec b/geninitrd.spec
index afba6f1e40378cf5b54b7ad93f115dafed911859..8e17a67bb5bf50da0abb89d6f30eb89a4a45c71b 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -7,12 +7,14 @@ Summary:      Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8):     Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:          geninitrd
 Version:       12757
-Release:       6
+Release:       7
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
 # Source0-md5: 3fb153489c3c245e5c1ee4bbc333acb4
 Patch0:                %{name}-git.patch
+Patch1:                %{name}-static-dev.patch
+Patch2:                %{name}-posix-sh.patch
 URL:           http://git.pld-linux.org/?p=projects/geninitrd.git
 BuildRequires: xmlto >= 0:0.0.18-1
 Requires:      /usr/bin/ldd
@@ -83,9 +85,10 @@ startu z initrd. Skrypt geninitrd generuje obraz ramdysku na podstawie
 bieżących informacji zawartych w /etc/modules.conf.
 
 %prep
-%setup -qc
-mv %{name}-%{version}*/* .
+%setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__make}