From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: 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 --- .../meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb | 16 ---------------- .../meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb | 16 ++++++++++++++++ .../meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb | 2 +- .../meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb | 9 --------- .../meta-oe/recipes-graphics/xorg-app/xrdb_1.1.1.bb | 9 +++++++++ .../meta-oe/recipes-graphics/xorg-app/xterm_330.bb | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.1.bb (limited to 'meta-openembedded/meta-oe/recipes-graphics/xorg-app') diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb deleted file mode 100644 index f40dec884..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb +++ /dev/null @@ -1,16 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc - -SUMMARY = "X.Org X11 X client utilities" - -DESCRIPTION = "A collection of utilities used to tweak and query the runtime configuration\ -of the X server." - -LIC_FILES_CHKSUM = "file://COPYING;md5=13f70acf3c27f5f834bbc954df775f8e" - -BBCLASSEXTEND = "native" - -DEPENDS += "libice" - -SRC_URI[md5sum] = "25dab02f8e40d5b71ce29a07dc901b8c" -SRC_URI[sha256sum] = "1216af2dee99b318fcf8bf9a259915273bcb37a7f1e7859af4f15d0ebf6f3f0a" - diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb new file mode 100644 index 000000000..62296b5be --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb @@ -0,0 +1,16 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc + +SUMMARY = "X.Org X11 X client utilities" + +DESCRIPTION = "A collection of utilities used to tweak and query the runtime configuration\ +of the X server." + +LIC_FILES_CHKSUM = "file://COPYING;md5=13f70acf3c27f5f834bbc954df775f8e" + +BBCLASSEXTEND = "native" + +DEPENDS += "libice" + +SRC_URI[md5sum] = "3b9b79fa0f9928161f4bad94273de7ae" +SRC_URI[sha256sum] = "e6ee213a217265cc76050e4293ea70b98c32dce6505c6421227efbda62ab60c6" + diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb index a6fc9e755..b42c1b950 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb @@ -5,7 +5,7 @@ events and executes requested commands if they occur. " LIC_FILES_CHKSUM = "file://COPYING;md5=208668fa9004709ba22c2b748140956c" -DEPENDS += "libxkbfile" +DEPENDS += "libxkbfile bison-native" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb deleted file mode 100644 index 85957e056..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc -SUMMARY = "X server resource database utility" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69" - -DEPENDS += "libxmu" - -SRC_URI[md5sum] = "b54c7e3e53b4f332d41ed435433fbda0" -SRC_URI[sha256sum] = "73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.1.bb new file mode 100644 index 000000000..e50c082d8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.1.bb @@ -0,0 +1,9 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc +SUMMARY = "X server resource database utility" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69" + +DEPENDS += "libxmu" + +SRC_URI[md5sum] = "96f9423eab4d0641c70848d665737d2e" +SRC_URI[sha256sum] = "2d23ade7cdbb487996bf77cbb32cbe9bdb34d004748a53de7a4a97660d2217b7" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb index 16f9b7882..c2feb8107 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb @@ -1,6 +1,6 @@ require recipes-graphics/xorg-app/xorg-app-common.inc SUMMARY = "xterm is the standard terminal emulator for the X Window System" -DEPENDS = "libxaw xproto xextproto libxext libxau libxinerama libxpm ncurses" +DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses" LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=f02ab9ebda87b770ecf711dbb3784a33" -- cgit v1.2.3