rpcbind, module bbclass and systemd fix

PATCH In review Khem Raj 2 participants 6 messages Jan 28, 2013

lore

Share & tools

lore

Khem Raj

author

2013-01-28 20:14 UTC #0 lore raw

cover rpcbind, module bbclass and systemd fix

This patchset is already in mailing lists for review in one form or another I am putting it into a branch consolidated

The following changes since commit e11fdc145255c8b97c6c7ac6c5f7ce8aa50bdf0d:

mtools : upgrade to 4.0.18 (2013-01-28 12:46:59 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib kraj/misc
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc

Khem Raj (3):
rpcbind: Dont use nss with uclibc
systemd: Drop ppc build breakage patch for test-unit-file module-base.bbclass: Call make instead of oe_runmake in
do_make_scripts

 meta/classes/module-base.bbclass                   |    2 +-
 ...it-file-Add-libsystemd-daemon.la-to-LDADD.patch |   32 -----------
 meta/recipes-core/systemd/systemd_197.bb           |    3 -
 .../rpcbind/rpcbind/0001-uclibc-nss.patch          |   30 ++++++++++
 .../rpcbind/0002-uclibc-rpcsvc-defines.patch       |   60 ++++++++++++++++++++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb     |    6 ++
 6 files changed, 97 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch
 create mode 100644 meta/recipes-extended/rpcbind/rpcbind/0001-uclibc-nss.patch
 create mode 100644 meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch

Signature · 1 line

1.7.9.5

Khem Raj

author

2013-01-28 20:14 UTC #1 lore raw

PATCH 1/3 rpcbind: Dont use nss with uclibc

Add defines which otherwise are missing in uclibc nss

Signed-off-by Khem Raj <[email protected]>

---
 .../rpcbind/rpcbind/0001-uclibc-nss.patch          |   30 ++++++++++
 .../rpcbind/0002-uclibc-rpcsvc-defines.patch       |   60 ++++++++++++++++++++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb     |    6 ++
 3 files changed, 96 insertions(+)
 create mode 100644 meta/recipes-extended/rpcbind/rpcbind/0001-uclibc-nss.patch
 create mode 100644 meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch

meta/recipes-extended/rpcbind/rpcbind/0001-uclibc-nss.patch new file +30 -0

new file mode 100644
index 0000000..afa55f3
@@ -0,0 +1,30 @@
+Upstream-Status: Pending
+
+From b8f0d7b7318ba344c25785d6f5cf3f8de98012d4 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <[email protected]>
+Date: Tue, 2 Feb 2010 09:36:03 +0000
+Subject: [PATCH 1/2] uclibc-nss
+
+---
+ src/rpcbind.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/rpcbind.c b/src/rpcbind.c
+index 525ffba..1fe1a60 100644
+--- a/src/rpcbind.c
++++ b/src/rpcbind.c
+@@ -67,7 +67,11 @@
+ #include <pwd.h>
+ #include <string.h>
+ #include <errno.h>
++#if defined(__UCLIBC__)
++#define __nss_configure_lookup(x,y)
++#else
+ #include <nss.h>
++#endif
+ #include "config.h"
+ #include "rpcbind.h"
+ 
+-- 
+1.6.6.1
+

meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch new file +60 -0

60 lines not on this page · raw message

meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb +6 -0

index 9fb4f51..a438063 100644
@@ -13,8 +13,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \
 SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
            file://init.d \
            file://fix_host_path.patch \
+           ${UCLIBCPATCHES} \
           "
 
+UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
+                             file://0002-uclibc-rpcsvc-defines.patch \
+                            "
+UCLIBCPATCHES ?= ""
+
 SRC_URI[md5sum] = "1a77ddb1aaea8099ab19c351eeb26316"
 SRC_URI[sha256sum] = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3"

Signature · 1 line

1.7.9.5

Khem Raj

author

2013-01-28 20:14 UTC #2 lore raw

PATCH 2/3 systemd: Drop ppc build breakage patch for test-unit-file

its been fixed differently upstream in 197

Signed-off-by Khem Raj <[email protected]>

---
 ...it-file-Add-libsystemd-daemon.la-to-LDADD.patch |   32 --------------------
 meta/recipes-core/systemd/systemd_197.bb           |    3 --
 2 files changed, 35 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch

meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch deleted +0 ~~-32~~

deleted file mode 100644
index 4cd2ee6..0000000
@@ -1,32 +0,0 @@
-Upstream-Status: Submitted
-
-From f3e0a95b6b3fe516e43ec72045c2fad239184392 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Tue, 22 Jan 2013 18:25:46 -0800
-Subject: [PATCH] test-unit-file: Add libsystemd-daemon.la to LDADD
-
-test-unit-file links with libsystemd-core which needs
-sd_* symbols from libsystemd-daemon
-
-Signed-off-by: Khem Raj <[email protected]>
----
- Makefile.am |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7d5bd5a..884227a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1270,7 +1270,8 @@ test_unit_file_CFLAGS = \
- 	$(DBUS_CFLAGS)
- 
- test_unit_file_LDADD = \
--	libsystemd-core.la
-+	libsystemd-core.la \
-+	libsystemd-daemon.la
- 
- test_log_SOURCES = \
- 	src/test/test-log.c
--- 
-1.7.9.5
-

meta/recipes-core/systemd/systemd_197.bb +0 -3

index 500c3ec..d4fee45 100644
@@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
 
 PROVIDES = "udev"
 
-PR = "r1"
-
 DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 libgcrypt"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"

@@ -24,7 +22,6 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
            ${UCLIBCPATCHES} \
            file://00-create-volatile.conf \
            file://0001-systemd-analyze-rewrite-in-C.patch \
-           file://0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch \
           "
 SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743"
 SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5"

Signature · 1 line

1.7.9.5

Martin Jansa

2013-01-28 20:26 UTC #3 lore raw

Re: [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file

Quoted 52 lines · Khem Raj

its been fixed differently upstream in 197

Signed-off-by Khem Raj <[email protected]>

---
 ...it-file-Add-libsystemd-daemon.la-to-LDADD.patch |   32 --------------------
 meta/recipes-core/systemd/systemd_197.bb           |    3 --
 2 files changed, 35 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch

meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch deleted +0 ~~-32~~

deleted file mode 100644
index 4cd2ee6..0000000
@@ -1,32 +0,0 @@
-Upstream-Status: Submitted
-
-From f3e0a95b6b3fe516e43ec72045c2fad239184392 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Tue, 22 Jan 2013 18:25:46 -0800
-Subject: [PATCH] test-unit-file: Add libsystemd-daemon.la to LDADD
-
-test-unit-file links with libsystemd-core which needs
-sd_* symbols from libsystemd-daemon
-
-Signed-off-by: Khem Raj <[email protected]>
----
- Makefile.am |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7d5bd5a..884227a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1270,7 +1270,8 @@ test_unit_file_CFLAGS = \
- 	$(DBUS_CFLAGS)
- 
- test_unit_file_LDADD = \
--	libsystemd-core.la
-+	libsystemd-core.la \
-+	libsystemd-daemon.la
- 
- test_log_SOURCES = \
- 	src/test/test-log.c
--- 
-1.7.9.5
-

meta/recipes-core/systemd/systemd_197.bb +0 -0

index 500c3ec..d4fee45 100644

meta/recipes-core/systemd/systemd_197.bb LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ · line 12

Quoted 5 lines

meta/recipes-core/systemd/systemd_197.bb +0 -2

@@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
 
 PROVIDES = "udev"
 
-PR = "r1"
-

^ PR going backwards

Quoted 19 lines

meta/recipes-core/systemd/systemd_197.bb +0 -1

 DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 libgcrypt"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"

@@ -24,7 +22,6 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
            ${UCLIBCPATCHES} \
            file://00-create-volatile.conf \
            file://0001-systemd-analyze-rewrite-in-C.patch \
-           file://0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch \
           "
 SRC_URI[md5sum] = "56a860dceadfafe59f40141eb5223743"
 SRC_URI[sha256sum] = "e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5"

Signature · 7 lines

1.7.9.5


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Khem Raj

author

2013-01-28 20:42 UTC #4 lore raw

Re: [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file

Quoted 5 lines · Martin Jansa

meta/recipes-core/systemd/systemd_197.bb LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ · line 12
Quoted 3 lines
meta/recipes-core/systemd/systemd_197.bb +0 -2
-PR = "r1"
-
^ PR going backwards

bah merge did not tell me that too bad fixed now in branch

Thanks

Khem Raj

author

2013-01-28 20:14 UTC #5 lore raw

PATCH 3/3 module-base.bbclass: Call make instead of oe_runmake in do_make_scripts

In reply to Khem Raj

This makes the external module compilation a bit more robust for cases where external module recipes may be passing extra params to make via EXTRA_OEMAKE, and more that often one needs to pass M=$(PWD) when building external modules and if we use EXTRA_OEMAKE that would mean that it would appear in do_make_scripts as well and since we are only changing the reference kernel src tree here it will not run the make scripts in desired directory.

It is also well explained in top makefile in kernel tree around line# 1335 in 3.4

|else # KBUILD_EXTMOD
|
|###
|# External module support.
|# When building external modules the kernel used as basis is considered
|# read-only, and no consistency checks are made and the make
|# system is not used on the basis kernel. If updates are required
|# in the basis kernel ordinary make commands (without M=...) must
|# be used.

Therefore passing M=... will not do the updates in the basis kernel as expected with 'make scripts' so we have to bypass EXTRA_OEMAKE

[Yocto #3787]

Signed-off-by Khem Raj <[email protected]>

---
 meta/classes/module-base.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/classes/module-base.bbclass +1 -1

index cfee50a..9dbb4b4 100644
@@ -18,6 +18,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 #
 do_make_scripts() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS 
-	oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
+	make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
 	           -C ${STAGING_KERNEL_DIR} scripts
 }

Signature · 1 line

1.7.9.5