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/libepoxy | |
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/libepoxy')
-rw-r--r-- | poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch | 33 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb (renamed from poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb) | 5 |
2 files changed, 2 insertions, 36 deletions
diff --git a/poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch b/poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch deleted file mode 100644 index d2b6c1a25..000000000 --- a/poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -Add option to disable tests. - -Upstream-Status: Submitted (https://github.com/anholt/libepoxy/pull/158) -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/meson.build b/meson.build -index b2ebaef..9632c7a 100644 ---- a/meson.build -+++ b/meson.build -@@ -242,7 +242,10 @@ libepoxy_inc = [ - - subdir('include/epoxy') - subdir('src') --subdir('test') -+ -+if get_option('tests') -+ subdir('test') -+endif - - if get_option('docs') - doxygen = find_program('doxygen', required: false) -diff --git a/meson_options.txt b/meson_options.txt -index b5d7c98..dc30e68 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -15,3 +15,7 @@ option('x11', - type: 'boolean', - value: true, - description: 'Enable X11 support (GLX or EGL-X11)') -+option('tests', -+ type: 'boolean', -+ value: true, -+ description: 'Build the test suite') diff --git a/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb b/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb index 5ca0868c2..106721226 100644 --- a/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb +++ b/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb @@ -6,10 +6,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://no-tests.patch \ " -SRC_URI[md5sum] = "63fe3847789258254dcd7e3fdb9e7f5e" -SRC_URI[sha256sum] = "4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5" +SRC_URI[md5sum] = "4a6b9e581da229dee74c2263c84b1eca" +SRC_URI[sha256sum] = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8" UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" inherit meson pkgconfig distro_features_check |