* [PATCH 0/3] rpcbind, module bbclass and systemd fix
@ 2013-01-28 19:58 Khem Raj
2013-01-28 19:58 ` [PATCH 1/3] rpcbind: Dont use nss with uclibc Khem Raj
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Khem Raj @ 2013-01-28 19:58 UTC (permalink / raw)
To: openembedded-core
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
--
1.7.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] rpcbind: Dont use nss with uclibc
2013-01-28 19:58 [PATCH 0/3] rpcbind, module bbclass and systemd fix Khem Raj
@ 2013-01-28 19:58 ` Khem Raj
2013-01-28 19:58 ` [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file Khem Raj
2013-01-28 19:58 ` [PATCH 3/3] module-base.bbclass: Call make instead of oe_runmake in do_make_scripts Khem Raj
2 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2013-01-28 19:58 UTC (permalink / raw)
To: openembedded-core
Add defines which otherwise are missing in uclibc nss
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../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
diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-uclibc-nss.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-uclibc-nss.patch
new file mode 100644
index 0000000..afa55f3
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/0001-uclibc-nss.patch
@@ -0,0 +1,30 @@
+Upstream-Status: Pending
+
+From b8f0d7b7318ba344c25785d6f5cf3f8de98012d4 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+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
+
diff --git a/meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch b/meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch
new file mode 100644
index 0000000..c54fc96
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch
@@ -0,0 +1,60 @@
+Upstream-Status: Pending
+
+From 077add040c2e30d3ac507362f4afe350f47be027 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 2 Feb 2010 09:47:57 +0000
+Subject: [PATCH 2/2] uclibc-rpcsvc-defines
+
+---
+ src/security.c | 28 ++++++++++++++++++++++++++++
+ 1 files changed, 28 insertions(+), 0 deletions(-)
+
+diff --git a/src/security.c b/src/security.c
+index 0edeac6..e9fed55 100644
+--- a/src/security.c
++++ b/src/security.c
+@@ -20,6 +20,32 @@
+ /*
+ * XXX for special case checks in check_callit.
+ */
++#if defined(__UCLIBC__)
++
++#define MOUNTPROC_MNT 1
++#define MOUNTPROC_UMNT 3
++
++#define NFS_PROGRAM 100003
++#define YPPROG 100004
++#define MOUNTPROG 100005
++#define YPBINDPROG 100007
++#define YPPASSWDPROG 100009
++#define RQUOTAPROG 100011
++
++#define YPPROC_NULL 0
++#define YPPROC_DOMAIN 1
++#define YPPROC_DOMAIN_NONACK 2
++#define YPPROC_MATCH 3
++#define YPPROC_FIRST 4
++#define YPPROC_NEXT 5
++#define YPPROC_XFR 6
++#define YPPROC_CLEAR 7
++#define YPPROC_ALL 8
++
++#define YPBINDPROC_SETDOM 2
++
++#else
++
+ #include <rpcsvc/mount.h>
+ #include <rpcsvc/rquota.h>
+ #include <rpcsvc/nfs_prot.h>
+@@ -27,6 +53,8 @@
+ #include <rpcsvc/ypclnt.h>
+ #include <rpcsvc/yppasswd.h>
+
++#endif
++
+ #include "rpcbind.h"
+
+ #ifdef LIBWRAP
+--
+1.6.6.1
+
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index 9fb4f51..a438063 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file
2013-01-28 19:58 [PATCH 0/3] rpcbind, module bbclass and systemd fix Khem Raj
2013-01-28 19:58 ` [PATCH 1/3] rpcbind: Dont use nss with uclibc Khem Raj
@ 2013-01-28 19:58 ` Khem Raj
2013-01-28 20:10 ` Martin Jansa
2013-01-28 19:58 ` [PATCH 3/3] module-base.bbclass: Call make instead of oe_runmake in do_make_scripts Khem Raj
2 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2013-01-28 19:58 UTC (permalink / raw)
To: openembedded-core
its been fixed differently upstream in 197
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...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
diff --git a/meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch b/meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch
deleted file mode 100644
index 4cd2ee6..0000000
--- a/meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Submitted
-
-From f3e0a95b6b3fe516e43ec72045c2fad239184392 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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
-
diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
index 500c3ec..d4fee45 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] module-base.bbclass: Call make instead of oe_runmake in do_make_scripts
2013-01-28 19:58 [PATCH 0/3] rpcbind, module bbclass and systemd fix Khem Raj
2013-01-28 19:58 ` [PATCH 1/3] rpcbind: Dont use nss with uclibc Khem Raj
2013-01-28 19:58 ` [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file Khem Raj
@ 2013-01-28 19:58 ` Khem Raj
2 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2013-01-28 19:58 UTC (permalink / raw)
To: openembedded-core
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 <raj.khem@gmail.com>
---
meta/classes/module-base.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass
index cfee50a..9dbb4b4 100644
--- a/meta/classes/module-base.bbclass
+++ b/meta/classes/module-base.bbclass
@@ -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
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file
2013-01-28 19:58 ` [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file Khem Raj
@ 2013-01-28 20:10 ` Martin Jansa
2013-01-28 20:26 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2013-01-28 20:10 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3200 bytes --]
On Mon, Jan 28, 2013 at 11:58:27AM -0800, Khem Raj wrote:
> its been fixed differently upstream in 197
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> ...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
>
> diff --git a/meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch b/meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch
> deleted file mode 100644
> index 4cd2ee6..0000000
> --- a/meta/recipes-core/systemd/systemd/0001-test-unit-file-Add-libsystemd-daemon.la-to-LDADD.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -Upstream-Status: Submitted
> -
> -From f3e0a95b6b3fe516e43ec72045c2fad239184392 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -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 <raj.khem@gmail.com>
> ----
> - 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
> -
> diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
> index 500c3ec..d4fee45 100644
> --- a/meta/recipes-core/systemd/systemd_197.bb
> +++ b/meta/recipes-core/systemd/systemd_197.bb
> @@ -8,8 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
>
> PROVIDES = "udev"
>
> -PR = "r1"
> -
^ PR going backwards
> 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"
> --
> 1.7.9.5
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file
2013-01-28 20:10 ` Martin Jansa
@ 2013-01-28 20:26 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2013-01-28 20:26 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On Mon, Jan 28, 2013 at 12:10 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> -PR = "r1"
>> -
>
> ^ PR going backwards
bah merge did not tell me that too bad fixed now in branch
Thanks
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-28 20:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-28 19:58 [PATCH 0/3] rpcbind, module bbclass and systemd fix Khem Raj
2013-01-28 19:58 ` [PATCH 1/3] rpcbind: Dont use nss with uclibc Khem Raj
2013-01-28 19:58 ` [PATCH 2/3] systemd: Drop ppc build breakage patch for test-unit-file Khem Raj
2013-01-28 20:10 ` Martin Jansa
2013-01-28 20:26 ` Khem Raj
2013-01-28 19:58 ` [PATCH 3/3] module-base.bbclass: Call make instead of oe_runmake in do_make_scripts Khem Raj
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox