diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-phosphor/recipes-core/systemd/systemd_%.bbappend | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-core/systemd/systemd_%.bbappend')
| -rw-r--r-- | meta-phosphor/recipes-core/systemd/systemd_%.bbappend | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend index 680f4f61b9..fa6a7ed8e7 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend @@ -1,23 +1,13 @@ FILES_${PN}-catalog-extralocales = \ "${exec_prefix}/lib/systemd/catalog/*.*.catalog" PACKAGES =+ "${PN}-catalog-extralocales" -PACKAGECONFIG_remove = "backlight binfmt firstboot hibernate ima \ - localed logind machined polkit quotacheck smack utmp \ - vconsole" +PACKAGECONFIG_remove = "backlight binfmt firstboot gshadow hibernate ima \ + localed logind machined nss nss-mymachines nss-resolve \ + polkit quotacheck smack utmp vconsole" + FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += "file://default.network" SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch" -SRC_URI += "file://0006-core-fix-the-check-if-CONFIG_CGROUP_BPF-is-on.patch" - -# Static neighbor support included in v240 so remove when updated -SRC_URI += "file://0001-networkd-Track-address-configuration.patch" -SRC_URI += "file://0002-networkd-Use-only-a-generic-CONFIGURING-state.patch" -SRC_URI += "file://0003-networkd-Static-neighbor-support.patch" - -# Fixes from upstream for openbmc/openbmc#3459 -SRC_URI += "file://0001-timedate-defer-the-property-changed-signal-until-job.patch" -SRC_URI += "file://0001-timedate-treat-activating-or-inactivating-NTP-client.patch" -SRC_URI += "file://0002-timedate-refuse-to-set-time-when-previous-request-is.patch" RRECOMMENDS_${PN} += "obmc-targets" FILES_${PN} += "${systemd_unitdir}/network/default.network" |