[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[f12-branch] Patches cherry-pick, libfreebl3.so/libsoftokn3.so



I would like to backport the following patches to the stable f12-branch;

- 0001-Use-the-correct-yum-configuration-file-when-searchin.patch

This patch I proposed for rawhide/F-13/master and was accepted; the same
problem exists on previous releases and I guess overall it has minor
impact (only the EFI boot images are affected and get the right logos)

- 0002 and 0003 come from the master branch as well, and are part of the
updates to NetworkManager. My attention was drawn to these patches by
the following error messages which would occur during compose:

bash: install: cannot stat
`/tmp/treedir.TTpv4G/install/lib/libfreebl3.so': No such file or directory
bash: install: cannot stat
`/tmp/treedir.TTpv4G/install/lib/libsoftokn3.so': No such file or directory

I had just a little difficulty applying these, since more then just one
patch edited the same region of the scripts/mk-images and
scripts/upd-instroot scripts.

Either way, my testing seems to have resolved the error messages perfectly.

Kind regards,

Jeroen van Meeuwen
-kanarip
>From be79409b3eba06c026bde80a8f04010bca36f8b4 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip fedoraunity org>
Date: Sun, 13 Dec 2009 03:31:08 +0100
Subject: [PATCH 1/4] Use the correct yum configuration file when searching for the -logos package

---
 scripts/mk-images.efi |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi
index 3be5594..7b31ced 100644
--- a/scripts/mk-images.efi
+++ b/scripts/mk-images.efi
@@ -174,7 +174,7 @@ prepareEfiTree() {
     mv -v $MBD_BOOTTREE_TMP/EFI/BOOT/grub.efi $MBD_BOOTTREE_TMP/EFI/BOOT/BOOT${tmpefiarch}.efi
     mv -v $MBD_BOOTTREE_TMP/EFI/BOOT/grub.conf $MBD_BOOTTREE_TMP/EFI/BOOT/BOOT${tmpefiarch}.conf
 
-    artpkg=$(repoquery --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}" --whatprovides ${brandpkgname}-logos | grep -v generic-logos | head -1)
+    artpkg=$(repoquery --qf "%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}" -c $yumconf --whatprovides ${brandpkgname}-logos | grep -v generic-logos | head -1)
     if [ -z "$artpkg" ]; then
        argpkg="generic-logos"
     fi
-- 
1.6.6

>From 46f0462dd9a3ec0311b4891cfa7413545700ceb9 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell redhat com>
Date: Thu, 21 Jan 2010 13:04:53 -1000
Subject: [PATCH 2/4] nss files moved around again, NM needs more (#557702)

We need libsoftokn3.so and libnssdbm3.so now for NetworkManager, both
are in the nss-softokn package.
---
 scripts/mk-images    |    3 ++-
 scripts/upd-instroot |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index 44e4664..eacf8ce 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -784,11 +784,12 @@ makeinitrd() {
 
     # Indirect dependencies
     install -m 755 $IMGPATH/$LIBDIR/libfreebl3.so $MBD_DIR/$LIBDIR/
-    install -m 755 $IMGPATH/$LIBDIR/libsoftokn3.so $MBD_DIR/$LIBDIR/
+    install -m 755 $IMGPATH/usr/$LIBDIR/libsoftokn3.so $MBD_DIR/$LIBDIR/
     install -m 755 $IMGPATH/usr/$LIBDIR/libsqlite3.so.0 $MBD_DIR/usr/$LIBDIR/
     install -m 755 $IMGPATH/$LIBDIR/libnss_dns.so.2 $MBD_DIR/$LIBDIR/
     install -m 755 $IMGPATH/$LIBDIR/libnss_files.so.2 $MBD_DIR/$LIBDIR/
     install -m 755 $IMGPATH/$LIBDIR/libgcc_s.so.1 $MBD_DIR/$LIBDIR/
+    install -m 755 $IMGPATH/usr/$LIBDIR/libnssdbm3.so $MBD_DIR/$LIBDIR/
 
     install -m 644 $IMGPATH/etc/udev/udev.conf $MBD_DIR/etc/udev/udev.conf
     for i in $IMGPATH/lib/udev/rules.d/*.rules ; do
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 561bc7e..8c0ff8b 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -476,6 +476,7 @@ usr/$LIBDIR/xserver/SecurityPolicy
 usr/$LIBDIR/libfreebl3.so
 usr/$LIBDIR/libnss3.so
 usr/$LIBDIR/libnssckbi.so
+usr/$LIBDIR/libnssdbm3.so
 usr/$LIBDIR/libnsspem.so
 usr/$LIBDIR/libsmime3.so
 usr/$LIBDIR/libsoftokn3.so
-- 
1.6.6

>From da7c9c7c2d2c4095a6867307dd66fd413831d61a Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip fedoraunity org>
Date: Tue, 9 Feb 2010 17:38:30 +0100
Subject: [PATCH 3/4] Make sure we get required nss-softokn libs in the images.

Check /lib and /usr/lib for these files.

Conflicts:

	scripts/upd-instroot
---
 scripts/mk-images    |   13 ++++++++++---
 scripts/upd-instroot |    3 +++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index eacf8ce..607250a 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -783,13 +783,20 @@ makeinitrd() {
     instbin $IMGPATH /usr/bin/wget $MBD_DIR /sbin/wget
 
     # Indirect dependencies
-    install -m 755 $IMGPATH/$LIBDIR/libfreebl3.so $MBD_DIR/$LIBDIR/
-    install -m 755 $IMGPATH/usr/$LIBDIR/libsoftokn3.so $MBD_DIR/$LIBDIR/
+    for nsslib in freebl3 softokn3 nssdbm3 ; do
+        if [ -f $IMGPATH/$LIBDIR/lib$nsslib.so ]; then
+            install -m 755 $IMGPATH/$LIBDIR/lib$nsslib.so $MBD_DIR/$LIBDIR/
+        elif [ -f $IMGPATH/usr/$LIBDIR/lib$nsslib.so ]; then
+            install -m 755 $IMGPATH/usr/$LIBDIR/lib$nsslib.so $MBD_DIR/$LIBDIR/
+        else
+            echo "ERROR: *** Missing lib$nsslib.so" >&2
+        fi
+    done
+
     install -m 755 $IMGPATH/usr/$LIBDIR/libsqlite3.so.0 $MBD_DIR/usr/$LIBDIR/
     install -m 755 $IMGPATH/$LIBDIR/libnss_dns.so.2 $MBD_DIR/$LIBDIR/
     install -m 755 $IMGPATH/$LIBDIR/libnss_files.so.2 $MBD_DIR/$LIBDIR/
     install -m 755 $IMGPATH/$LIBDIR/libgcc_s.so.1 $MBD_DIR/$LIBDIR/
-    install -m 755 $IMGPATH/usr/$LIBDIR/libnssdbm3.so $MBD_DIR/$LIBDIR/
 
     install -m 644 $IMGPATH/etc/udev/udev.conf $MBD_DIR/etc/udev/udev.conf
     for i in $IMGPATH/lib/udev/rules.d/*.rules ; do
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 8c0ff8b..03e0a2f 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -282,8 +282,11 @@ KEEPFILE=${TMPDIR:-/tmp}/keepfile.$$
 cat > $KEEPFILE <<EOF
 $LIBDIR/bdevid
 $LIBDIR/dbus-1
+$LIBDIR/libfreebl3.so
 $LIBDIR/libnss_dns*
 $LIBDIR/libnss_files*
+$LIBDIR/libnssdbm3.so
+$LIBDIR/libsoftokn3.so
 bin/arch
 bin/basename
 bin/bash
-- 
1.6.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]