Skip to contentSkip to conversation

systemd: Upgrade 206 -> 208

PATCH Superseded Khem Raj 2 participants 2 messages Nov 11, 2013 – Nov 12, 2013

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/1 systemd: Upgrade 206 -> 208

Remove patches accepted upstream
Forward-port uclibc patches
Create additional packages to bundle zsh support files

---
 .../0001-use-CAP_MKNOD-ConditionCapability.patch   |  32 -----
 .../systemd/systemd/systemd-pam-fix-msformat.patch | 137 ++++++++++-----------
 .../systemd/{systemd_206.bb => systemd_208.bb}     |  12 +-
 3 files changed, 76 insertions(+), 105 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch
 rename meta/recipes-core/systemd/{systemd_206.bb => systemd_208.bb} (97%)
meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch deleted +0 -32
deleted file mode 100644
index 4a35c23..0000000
@@ -1,32 +0,0 @@
-Upstream-Status: Submitted
-
-From cfdd1eb76dced87c73bac8ec22d3a10244c9bbf6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 21 Aug 2013 20:25:19 -0700
-Subject: [PATCH] use CAP_MKNOD ConditionCapability
-
-Fixes errors seen when booting VMs on QEMU like
-
-systemd[1]: kmod-static-nodes.service: main process exited, code=exited, status=203/EXEC
-systemd[1]: Failed to start Create list of required static device nodes for the current kernel.
-systemd[1]: Unit kmod-static-nodes.service entered failed state.
-
-Make sure that mknod capability is available
-
-Signed-off-by: Khem Raj <[email protected]>
----
- units/kmod-static-nodes.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: systemd-206/units/kmod-static-nodes.service.in
-===================================================================
---- systemd-206.orig/units/kmod-static-nodes.service.in	2013-08-21 19:13:02.000000000 -0700
-+++ systemd-206/units/kmod-static-nodes.service.in	2013-08-21 20:39:13.310689871 -0700
-@@ -9,6 +9,7 @@
- Description=Create list of required static device nodes for the current kernel
- DefaultDependencies=no
- Before=sysinit.target systemd-tmpfiles-setup-dev.service
-+ConditionCapability=CAP_MKNOD
- 
- [Service]
- Type=oneshot
meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch +68 -69

230 lines not on this page · raw message

meta/recipes-core/systemd/systemd_208.bb renamed from meta/recipes-core/systemd/systemd_206.bb +8 -4
similarity index 97%
rename from meta/recipes-core/systemd/systemd_206.bb
rename to meta/recipes-core/systemd/systemd_208.bb
index a1a8bd7..ee716f4 100644
@@ -18,7 +18,6 @@ SECTION = "base/shell"
 inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest
 
 SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
-           file://0001-use-CAP_MKNOD-ConditionCapability.patch \
            file://0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch \
            file://binfmt-install.patch \
            file://touchscreen.rules \
@@ -27,8 +26,8 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
            file://init \
            file://run-ptest \
           "
-SRC_URI[md5sum] = "89e36f2d3ba963020b72738549954cbc"
-SRC_URI[sha256sum] = "4c993de071118ea1df7ffc4be26ef0b0d78354ef15b2743a2783d20edfcde9de"
+SRC_URI[md5sum] = "df64550d92afbffb4f67a434193ee165"
+SRC_URI[sha256sum] = "aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390"
 
 UCLIBCPATCHES = ""
 UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \
@@ -134,7 +133,8 @@ python populate_packages_prepend (){
 }
 PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
 
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install ${PN}-rpm-macros ${PN}-binfmt"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \
+             ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh"
 
 SYSTEMD_PACKAGES = "${PN}-binfmt"
 SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
@@ -160,6 +160,10 @@ FILES_${PN}-kernel-install = "${bindir}/kernel-install \
 FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \
                          "
 
+FILES_${PN}  += "${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)}"
+
+FILES_${PN}-zsh = "${datadir}/zsh/site-functions"
+
 FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
                       ${exec_prefix}/lib/binfmt.d \
                       ${rootlibexecdir}/systemd/systemd-binfmt \
Signature · 1 line
1.8.3.2
#1 lore raw

meta/recipes-core/systemd/systemd_208.bb python populate_packages_prepend (){ · line 137

Quoted 3 lines · Khem Raj
meta/recipes-core/systemd/systemd_208.bb renamed from meta/recipes-core/systemd/systemd_206.bb +2 -1
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install ${PN}-rpm-macros ${PN}-binfmt"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \
+             ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh"

You're creating an empty ${PN}-pam package here.

Ross