| commit | 1b69d4bc2a363ffb2d727e44c64435a5e33e2199 | [log] [tgz] |
|---|---|---|
| author | Patrick Williams <patrick@stwcx.xyz> | Wed Mar 09 11:58:44 2016 -0600 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Wed Mar 09 11:58:44 2016 -0600 |
| tree | 3b0329383517d39ba284ef000ee1b1990664ed63 | |
| parent | d7eea1d1c79e85538ab775dc7fc25b44d26c82c0 [diff] | |
| parent | 5e95bb193441d205782fd9d0b50d0fc1a8fced20 [diff] |
Merge pull request #203 from williamspatrick/yocto-cleanup Yocto cleanup
diff --git a/yocto-poky/meta/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch similarity index 100% rename from yocto-poky/meta/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch rename to meta-phosphor/common/recipes-core/glibc/cross-localedef-native/0001-add-support-for-Power8-LE-mode.patch
diff --git a/meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend new file mode 100644 index 0000000..f065ed7 --- /dev/null +++ b/meta-phosphor/common/recipes-core/glibc/cross-localedef-native_2.22.bbappend
@@ -0,0 +1,2 @@ +SRC_URI += "file://0001-add-support-for-Power8-LE-mode.patch" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
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 similarity index 100% rename from yocto-poky/meta/recipes-core/systemd/systemd/0100-systemd_networkd_dbus_setaddress.patch rename to 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 8b3b25d..222be49 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/glibc/cross-localedef-native_2.22.bb b/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb index c7a9db7..2153ece 100644 --- a/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb +++ b/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.22.bb
@@ -20,7 +20,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${BRANCH};name=glibc \ git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef \ file://fix_for_centos_5.8.patch \ - file://0001-add-support-for-Power8-LE-mode.patch \ ${EGLIBCPATCHES} \ " EGLIBCPATCHES = "\
diff --git a/yocto-poky/meta/recipes-core/systemd/systemd_225.bb b/yocto-poky/meta/recipes-core/systemd/systemd_225.bb index e3d55ec..f7d4c7d 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 @@ 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 \