summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2016-03-07 11:15:48 -0600
committerPatrick Williams <patrick@stwcx.xyz>2016-03-07 11:15:48 -0600
commit440c871d2fcdc5456befa9ace3e421ab0bde2237 (patch)
tree130e2415553cd63a517cd938f403ecdea6979a67
parenta559381b9aa406b6ab51b420685aabbc123dc569 (diff)
downloadtalos-openbmc-440c871d2fcdc5456befa9ace3e421ab0bde2237.tar.gz
talos-openbmc-440c871d2fcdc5456befa9ace3e421ab0bde2237.zip
Move systemd patches from yocto-poky tree.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
-rw-r--r--meta-phosphor/common/recipes-core/systemd/systemd/0100-systemd_networkd_dbus_setaddress.patch (renamed from yocto-poky/meta/recipes-core/systemd/systemd/0100-systemd_networkd_dbus_setaddress.patch)0
-rw-r--r--meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend1
-rw-r--r--yocto-poky/meta/recipes-core/systemd/systemd_225.bb1
3 files changed, 1 insertions, 1 deletions
diff --git a/yocto-poky/meta/recipes-core/systemd/systemd/0100-systemd_networkd_dbus_setaddress.patch b/meta-phosphor/common/recipes-core/systemd/systemd/0100-systemd_networkd_dbus_setaddress.patch
index e105dddcb..e105dddcb 100644
--- a/yocto-poky/meta/recipes-core/systemd/systemd/0100-systemd_networkd_dbus_setaddress.patch
+++ b/meta-phosphor/common/recipes-core/systemd/systemd/0100-systemd_networkd_dbus_setaddress.patch
diff --git a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
index 8b3b25d34..222be49ed 100644
--- a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend
@@ -1,6 +1,7 @@
PACKAGECONFIG += "networkd"
FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
SRC_URI += "file://default.network"
+SRC_URI += "file://0100-systemd_networkd_dbus_setaddress.patch"
FILES_${PN} += "${libdir}/systemd/network/default.network"
diff --git a/yocto-poky/meta/recipes-core/systemd/systemd_225.bb b/yocto-poky/meta/recipes-core/systemd/systemd_225.bb
index e3d55ec35..f7d4c7df4 100644
--- a/yocto-poky/meta/recipes-core/systemd/systemd_225.bb
+++ b/yocto-poky/meta/recipes-core/systemd/systemd_225.bb
@@ -41,7 +41,6 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
file://0012-implment-systemd-sysv-install-for-OE.patch \
file://0014-Revert-rules-remove-firmware-loading-rules.patch \
file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
- file://0100-systemd_networkd_dbus_setaddress.patch \
file://touchscreen.rules \
file://00-create-volatile.conf \
file://init \
OpenPOWER on IntegriCloud