diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-graphics/xorg-util | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-graphics/xorg-util')
-rw-r--r-- | poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb | 21 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-util/util-macros_1.19.2.bb (renamed from poky/meta/recipes-graphics/xorg-util/util-macros_1.19.1.bb) | 4 |
3 files changed, 3 insertions, 24 deletions
diff --git a/poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb b/poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb deleted file mode 100644 index be3a66744..000000000 --- a/poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Program to create dependencies in makefiles" - -DESCRIPTION = "The gccmakedep program calls 'gcc -M' to output makefile \ -rules describing the dependencies of each sourcefile, so that make knows \ -which object files must be recompiled when a dependency has changed." - -require xorg-util-common.inc -LIC_FILES_CHKSUM = "file://Makefile.am;endline=20;md5=23c277396d690413245ebb89b18c5d4d" -DESCRIPTION = "create dependencies in makefiles using 'gcc -M'" -DEPENDS = "util-macros" -RDEPENDS_${PN} = "gcc" - -PR = "r3" -PE = "1" - -SRC_URI[md5sum] = "127ddb6131eb4a56fdf6644a63ade788" -SRC_URI[sha256sum] = "f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548" - -do_install_append() { - sed -i "s,--sysroot=${STAGING_DIR_TARGET},," ${D}${bindir}/gccmakedep -} diff --git a/poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb b/poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb index 84a967a81..727ab5496 100644 --- a/poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb +++ b/poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb @@ -10,7 +10,7 @@ directives would be used in a compilation. Any #include, directives \ can reference files having other #include directives, and parsing will \ occur in these files as well." -DEPENDS = "xproto util-macros" +DEPENDS = "xorgproto util-macros" PE = "1" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-graphics/xorg-util/util-macros_1.19.1.bb b/poky/meta/recipes-graphics/xorg-util/util-macros_1.19.2.bb index b39d78756..268059935 100644 --- a/poky/meta/recipes-graphics/xorg-util/util-macros_1.19.1.bb +++ b/poky/meta/recipes-graphics/xorg-util/util-macros_1.19.2.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1970511fddd439b07a6ba789d28ff662" PE = "1" -SRC_URI[md5sum] = "3f8a8e6100556f7f28e469809805dee8" -SRC_URI[sha256sum] = "472ad0e41d1e0abf5ecafd29460bf1b8d47e53d4b7d3abf1f66d02dc576547b8" +SRC_URI[md5sum] = "5059b328fac086b733ffac6607164c41" +SRC_URI[sha256sum] = "9225c45c3de60faf971979a55a5536f3562baa4b6f02246c23e98ac0c09a75b7" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" |