A few random pending fixes

From: Christopher Larson <[email protected]>

The following changes since commit ef637e417ae1c2dff7fc0ad6cb30989e72ac35ab:

grub-efi-native: remove help2man dependency (2012-07-20 12:32:13 +0100)

are available in the git repository at:

git://github.com/kergoth/oe-core.git misc

Christopher Larson (3):
bluez4: use PACKAGECONFIG to control 'pie'
initscripts: don't bg mk_dirs in populate-volatile
libpcap: fix pcap-config to not return -Wl,-rpath

 meta/recipes-connectivity/bluez/bluez4.inc         |    6 +++++-
 meta/recipes-connectivity/bluez/bluez4_4.101.bb    |    2 +-
 meta/recipes-connectivity/libpcap/libpcap.inc      |    3 ++-
 .../initscripts-1.0/populate-volatile.sh           |    4 ++--
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

1.7.9.5

From: Christopher Larson <[email protected]>

This lets us control whether we build position independent executables. As, as far as I know no distros are adding a 'pie' distro feature, the effect of this commit for most will be to disable pie in bluez4. I think this is best to ensure consistent behavior among the recipes with regard to this.

This also sidesteps a build failure I've seen with bluez4 failing due to libudev.a not having been built fPIC.

---
 meta/recipes-connectivity/bluez/bluez4.inc      |    6 +++++-
 meta/recipes-connectivity/bluez/bluez4_4.101.bb |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

index 6dc06f4..6ddd58d 100644
@@ -10,8 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
 DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck"
 RDEPENDS_${PN}-dev = "bluez-hcidump"
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG ??= "\
+    ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
+    ${@base_contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\
+"
 PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
+PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
 
 ASNEEDED = ""
 

index 4a360b6..e26d4ea 100644
@@ -1,6 +1,6 @@
 require bluez4.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://bluetooth.conf \
             file://sbc_mmx.patch"

1.7.9.5

From: Christopher Larson <[email protected]>

If a directory needs to be created to create something else in volatiles, there's no guarantees on ordering due to the backgrounding. We can't guarantee with certainty that the create directory commands are complete before the later ones run. This ensures that we wait for directory creations to complete before we proceed.

Chris Hallinan hit an actual failure due to this back in March of last year.

---
 .../initscripts-1.0/populate-volatile.sh           |    4 ++--
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

index 4a99aff..d2175d7 100755
@@ -42,7 +42,7 @@ mk_dir() {
 	[ -e "$1" ] && {
 	  [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
 	} || {
-	  eval $EXEC &
+	  eval $EXEC
 	}
 }
 

@@ -153,7 +153,7 @@ apply_cfgfile() {
             create_file "${TNAME}" &
 	    ;;
       "d")  [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
-            mk_dir "${TNAME}" &
+            mk_dir "${TNAME}"
 	    # Add check to see if there's an entry in fstab to mount.
 	    ;;
       *)    [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."

index 1d80c55..b741b61 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
 SECTION = "base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r135"
+PR = "r136"
 
 INHIBIT_DEFAULT_DEPS = "1"
 

1.7.9.5

From: Christopher Larson <[email protected]>

---
 meta/recipes-connectivity/libpcap/libpcap.inc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index 427078f..7d4e841 100644
@@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native"
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
 PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz"
 

@@ -29,4 +29,5 @@ do_configure_prepend () {
     if [ ! -e acinclude.m4 ]; then
         cat aclocal.m4 > acinclude.m4
     fi
+    sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
 }

1.7.9.5

Not Merged, was not in my list for some reason, will double check

Merged these 2 into OE-Core

Thanks
Sau!

Merged to master, thanks.

Richard