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-app | |
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-app')
-rw-r--r-- | poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb (renamed from poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb) | 6 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-app/xeyes_1.1.2.bb (renamed from poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-app/xinit_1.4.0.bb (renamed from poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb (renamed from poky/meta/recipes-graphics/xorg-app/xkbcomp_1.4.0.bb) | 6 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-app/xprop_1.2.3.bb (renamed from poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-app/xset_1.2.4.bb (renamed from poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.4.bb (renamed from poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb) | 4 |
9 files changed, 17 insertions, 19 deletions
diff --git a/poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb b/poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb index 31cf18676..2a6bec164 100644 --- a/poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb +++ b/poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb @@ -8,11 +8,11 @@ font name (XLFD) is generated, and is written together with the file \ name to a file fonts.scale in the directory. The resulting fonts.scale \ is used by the mkfontdir program." -DEPENDS = "util-macros-native zlib libfontenc freetype xproto" +DEPENDS = "util-macros-native zlib libfontenc freetype xorgproto" BBCLASSEXTEND = "native" LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f" -SRC_URI[md5sum] = "9bdd6ebfa62b1bbd474906ac86a40fd8" -SRC_URI[sha256sum] = "8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20" +SRC_URI[md5sum] = "987c438e79f5ddb84a9c5726a1610819" +SRC_URI[sha256sum] = "1e98df69ee5f4542d711e140e1d93e2c3f2775407ccbb7849110d52b91782a6a" diff --git a/poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb b/poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb index 87268046e..c3e853631 100644 --- a/poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb +++ b/poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb @@ -6,7 +6,7 @@ to RGB values (rgb.txt) and, if configured to use a database for color \ lookup, the rgb program to convert the text file into the binary database \ format." -DEPENDS += " xproto util-macros" +DEPENDS += " xorgproto util-macros" LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb b/poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb index f151b579e..0705b7f7f 100644 --- a/poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb +++ b/poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" PE = "1" -DEPENDS += "libxrandr xproto" +DEPENDS += "libxrandr xorgproto" SRC_URI += "file://diet-x11.patch" diff --git a/poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb b/poky/meta/recipes-graphics/xorg-app/xeyes_1.1.2.bb index 84d0cb804..06885f8f5 100644 --- a/poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb +++ b/poky/meta/recipes-graphics/xorg-app/xeyes_1.1.2.bb @@ -8,7 +8,7 @@ PE = "1" LIC_FILES_CHKSUM = "file://COPYING;md5=3ea51b365051ac32d1813a7dbaa4bfc6" -SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981" -SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521" +SRC_URI[md5sum] = "6f0543ec84283df5743eeafc173bea4a" +SRC_URI[sha256sum] = "57bcec0d2d167af9e5d44d0dbd74c6d7c0f0591cd0608952b23c749fdd910553" DEPENDS += "libxau libxt libxext libxmu libxrender" diff --git a/poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb b/poky/meta/recipes-graphics/xorg-app/xinit_1.4.0.bb index 93185188e..dc2a06b58 100644 --- a/poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb +++ b/poky/meta/recipes-graphics/xorg-app/xinit_1.4.0.bb @@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" PE = "1" -SRC_URI[md5sum] = "4e928452dfaf73851413a2d8b8c76388" -SRC_URI[sha256sum] = "75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3" +SRC_URI[md5sum] = "2da154b2f80ca9637b1a17b13af0880c" +SRC_URI[sha256sum] = "230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef" EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" diff --git a/poky/meta/recipes-graphics/xorg-app/xkbcomp_1.4.0.bb b/poky/meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb index c9dc327c4..eaf8eaaf7 100644 --- a/poky/meta/recipes-graphics/xorg-app/xkbcomp_1.4.0.bb +++ b/poky/meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb @@ -9,11 +9,9 @@ be read directly by XKB-capable X servers or utilities." LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a" -PR = "${INC_PR}.0" - DEPENDS += "libxkbfile" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "cc22b232bc78a303371983e1b48794ab" -SRC_URI[sha256sum] = "bc69c8748c03c5ad9afdc8dff9db11994dd871b614c65f8940516da6bf61ce6b" +SRC_URI[md5sum] = "12610df19df2af3797f2c130ee2bce97" +SRC_URI[sha256sum] = "6dd8bcb9be7e85bd7294abe261b8c7b0539d2fc93e41b80fb8bd013767ce8424" diff --git a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.3.bb index d78bf0451..ca58d4751 100644 --- a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb +++ b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.3.bb @@ -14,5 +14,5 @@ DEPENDS += "libxmu" PE = "1" -SRC_URI[md5sum] = "fae3d2fda07684027a643ca783d595cc" -SRC_URI[sha256sum] = "9bee88b1025865ad121f72d32576dd3027af1446774aa8300cce3c261d869bc6" +SRC_URI[md5sum] = "4becb3ddc4674d741487189e4ce3d0b6" +SRC_URI[sha256sum] = "d22afb28c86d85fff10a50156a7d0fa930c80ae865d70b26d805fd28a17a521b" diff --git a/poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb b/poky/meta/recipes-graphics/xorg-app/xset_1.2.4.bb index f683b7603..5748837fd 100644 --- a/poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb +++ b/poky/meta/recipes-graphics/xorg-app/xset_1.2.4.bb @@ -12,8 +12,8 @@ PE = "1" SRC_URI += "file://disable-xkb.patch" -SRC_URI[md5sum] = "dcd227388b57487d543cab2fd7a602d7" -SRC_URI[sha256sum] = "4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063" +SRC_URI[md5sum] = "70ea7bc7bacf1a124b1692605883f620" +SRC_URI[sha256sum] = "e4fd95280df52a88e9b0abc1fee11dcf0f34fc24041b9f45a247e52df941c957" CFLAGS += "-D_GNU_SOURCE" EXTRA_OECONF = "--disable-xkb --without-fontcache" diff --git a/poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb b/poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.4.bb index 0c23d1943..1fb90dd24 100644 --- a/poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb +++ b/poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.4.bb @@ -11,5 +11,5 @@ DEPENDS += "libxext libxmu gettext-native" PE = "0" -SRC_URI[md5sum] = "b777bafb674555e48fd8437618270931" -SRC_URI[sha256sum] = "218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8" +SRC_URI[md5sum] = "9a505b91ae7160bbdec360968d060c83" +SRC_URI[sha256sum] = "839498aa46b496492a5c65cd42cd2e86e0da88149b0672e90cb91648f8cd5b01" |