* [PATCH 1/4] systemd: update uclibc patch headers
2013-01-21 18:09 [PATCH 0/4] More systemd fixes Ross Burton
@ 2013-01-21 18:09 ` Ross Burton
2013-01-21 18:09 ` [PATCH 2/4] systemd-serialgetty: remove redundant statements Ross Burton
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2013-01-21 18:09 UTC (permalink / raw)
To: openembedded-core
Discussion has revealed that upstream has formally rejected patches to support
uclibc, so mark this in the headers.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/systemd/systemd/optional_secure_getenv.patch | 4 ++--
.../systemd/systemd/systemd-pam-configure-check-uclibc.patch | 2 +-
meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch | 2 +-
meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch | 2 +-
meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch | 2 +-
meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch | 2 +-
meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd/optional_secure_getenv.patch b/meta/recipes-core/systemd/systemd/optional_secure_getenv.patch
index 35f1467..2063268 100644
--- a/meta/recipes-core/systemd/systemd/optional_secure_getenv.patch
+++ b/meta/recipes-core/systemd/systemd/optional_secure_getenv.patch
@@ -1,9 +1,9 @@
on uclibc secure_getenv is not available
therefore default to using getenv instead
-Singed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Denied [no desire for uclibc support]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
Index: git/src/shared/missing.h
===================================================================
--- git.orig/src/shared/missing.h 2012-09-22 18:46:44.141282145 -0700
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch b/meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch
index c69a8ab..d096983 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Pending
+Upstream-Status: Denied [no desire for uclibc support]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- systemd-185.orig/configure.ac 2012-06-04 14:15:16.000000000 -0400
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
index 1ed4d30..1d4f273 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Pending
+Upstream-Status: Denied [no desire for uclibc support]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: git/src/nspawn/nspawn.c
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
index 8bc7a6f..7cf9626 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Pending
+Upstream-Status: Denied [no desire for uclibc support]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: git/src/journal/journal-file.c
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch
index 8845624..533a239 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch
@@ -1,6 +1,6 @@
Prefer getty to agetty in console setup systemd units
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [configuration specific]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
units/getty@.service.m4 | 2 +-
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch
index be4d3e3..fb8443d 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Pending
+Upstream-Status: Denied [no desire for uclibc support]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: git/src/journal/journal-send.c
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
index cdf8d61..f3b1ace 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch
@@ -1,4 +1,4 @@
-Upstream-Status: Pending
+Upstream-Status: Denied [no desire for uclibc support]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- systemd-pam-185/src/fsck/fsck.c.orig 2012-06-22 23:22:22.000000000 -0400
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/4] systemd-serialgetty: remove redundant statements
2013-01-21 18:09 [PATCH 0/4] More systemd fixes Ross Burton
2013-01-21 18:09 ` [PATCH 1/4] systemd: update uclibc patch headers Ross Burton
@ 2013-01-21 18:09 ` Ross Burton
2013-01-21 18:09 ` [PATCH 3/4] systemd-serialgetty: skip package when not using systemd Ross Burton
2013-01-21 18:09 ` [PATCH 4/4] systemd: remove unused SERIAL_CONSOLE variable Ross Burton
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2013-01-21 18:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/systemd/systemd-serialgetty.bb | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 7e7368b..3e2a0e3 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -35,9 +35,6 @@ do_install() {
fi
}
-PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-doc"
-
-RRECOMMENDS_${PN} = ""
RDEPENDS_${PN} = "systemd"
# This is a machine specific file
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/4] systemd-serialgetty: skip package when not using systemd
2013-01-21 18:09 [PATCH 0/4] More systemd fixes Ross Burton
2013-01-21 18:09 ` [PATCH 1/4] systemd: update uclibc patch headers Ross Burton
2013-01-21 18:09 ` [PATCH 2/4] systemd-serialgetty: remove redundant statements Ross Burton
@ 2013-01-21 18:09 ` Ross Burton
2013-01-21 18:09 ` [PATCH 4/4] systemd: remove unused SERIAL_CONSOLE variable Ross Burton
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2013-01-21 18:09 UTC (permalink / raw)
To: openembedded-core
As this package RDEPENDS on systemd it wants to build systemd, but if systemd
isn't a DISTRO_FEATURE then that package is skipped so world builds fail. Solve
this by skipping this package too.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/systemd/systemd-serialgetty.bb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 3e2a0e3..96cbf31 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -40,3 +40,9 @@ RDEPENDS_${PN} = "systemd"
# This is a machine specific file
FILES_${PN} = "${systemd_unitdir}/system/serial-getty@.service ${sysconfdir}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# As this package is tied to systemd, only build it when we're also building systemd.
+python () {
+ if not oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
+ raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
+}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] systemd: remove unused SERIAL_CONSOLE variable
2013-01-21 18:09 [PATCH 0/4] More systemd fixes Ross Burton
` (2 preceding siblings ...)
2013-01-21 18:09 ` [PATCH 3/4] systemd-serialgetty: skip package when not using systemd Ross Burton
@ 2013-01-21 18:09 ` Ross Burton
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2013-01-21 18:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/systemd/systemd_196.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_196.bb b/meta/recipes-core/systemd/systemd_196.bb
index 5242b5a..a78a8a6 100644
--- a/meta/recipes-core/systemd/systemd_196.bb
+++ b/meta/recipes-core/systemd/systemd_196.bb
@@ -11,8 +11,6 @@ PROVIDES = "udev"
DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0 libgcrypt"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-SERIAL_CONSOLE ?= "115200 /dev/ttyS0"
-
SECTION = "base/shell"
inherit gtk-doc useradd pkgconfig autotools perlnative
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread