Fix the uuidgen error for wayland images

diff --git a/packaging/libzypp.changes b/packaging/libzypp.changes
index 9754eb7..62fc296 100644 (file)
--- a/packaging/libzypp.changes
+++ b/packaging/libzypp.changes
@@ -1,3 +1,6 @@
+* Fri Apr 26 22:12:13 UTC 2013 - tracy.graydon@intel.com
+- Add uuidgen patch 
+
 * Fri Jul 22 2011 Zhang Qiang <qiang.z.zhang@intel.com> - 9.8.3
 - Add meego-try-again-while-downloading-fails.patch to fix BMC#21712 
 

diff --git a/packaging/libzypp.spec b/packaging/libzypp.spec
index 0a2ed5e..375422b 100644 (file)
--- a/packaging/libzypp.spec
+++ b/packaging/libzypp.spec
@@ -28,17 +28,18 @@ Requires:       satsolver-tools
 
 Patch0:        libzypp-6.29.2-meego.patch
 Patch1:        libzypp-log-issue-bug704.patch
-Patch2:         libzypp-meego-release.patch
+Patch2:     libzypp-meego-release.patch
 Patch3:                use_gpg2.patch
-Patch5:         meego-check-products-dir-while-using-rpmdb2solv.patch
-Patch6:         MeeGo-resume-download.patch
-Patch10:        MeeGo-dont-use-multcurl-by-default.patch
-Patch11:        MeeGo-Add-Rpm-Checker.patch
-Patch12:        MeeGo-use-fullname-in-search_deltafile.patch
-Patch13:        MeeGo-patch-readd-thumb-arch-definitions.patch
-Patch14:        linker.patch
+Patch4:                uuidgen.patch
+Patch5:     meego-check-products-dir-while-using-rpmdb2solv.patch
+Patch6:     MeeGo-resume-download.patch
+Patch10:    MeeGo-dont-use-multcurl-by-default.patch
+Patch11:    MeeGo-Add-Rpm-Checker.patch
+Patch12:    MeeGo-use-fullname-in-search_deltafile.patch
+Patch13:    MeeGo-patch-readd-thumb-arch-definitions.patch
+Patch14:    linker.patch
 Patch15:       0001-Disable-proxy-only-if-_none_-is-set-in-repo-file.patch 
-Patch16:        meego-try-again-while-downloading-fails.patch
+Patch16:    meego-try-again-while-downloading-fails.patch
 Patch17:       docs.patch
 
 %description
@@ -87,6 +88,7 @@ Authors:
 %patch1 -p1 -b .log-issue
 %patch2 -p1 -b .meego-release
 %patch3 -p1 
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch10 -p1

diff --git a/packaging/uuidgen.patch b/packaging/uuidgen.patch
new file mode 100644 (file)
index 0000000..b7ecdf0
--- /dev/null
+++ b/packaging/uuidgen.patch
@@ -0,0 +1,41 @@
+Index: libzypp-9.8.3/zypp/target/TargetImpl.cc
+===================================================================
+--- libzypp-9.8.3.orig/zypp/target/TargetImpl.cc
++++ libzypp-9.8.3/zypp/target/TargetImpl.cc
+@@ -667,31 +667,12 @@ namespace zypp
+     }
+ 
+     /**
+-     * generates a random id using uuidgen
+-     */
+-    static string generateRandomId()
++     *      * generates a random id using uuidgen
++     *           */
++    static std::string generateRandomId()
+     {
+-      string id;
+-      const char* argv[] =
+-      {
+-         "/usr/bin/uuidgen",
+-         NULL
+-      };
+-
+-      ExternalProgram prog( argv,
+-                            ExternalProgram::Normal_Stderr,
+-                            false, -1, true);
+-      std::string line;
+-      for(line = prog.receiveLine();
+-          ! line.empty();
+-          line = prog.receiveLine() )
+-      {
+-          MIL << line << endl;
+-          id = line;
+-          break;
+-      }
+-      prog.close();
+-      return id;
++          std::ifstream uuidprovider( "/proc/sys/kernel/random/uuid" );
++          return iostr::getline( uuidprovider );
+     }
+ 
+     /**