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-support/gdbm | |
| 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-support/gdbm')
| -rw-r--r-- | poky/meta/recipes-support/gdbm/files/ptest.patch | 22 | ||||
| -rw-r--r-- | poky/meta/recipes-support/gdbm/gdbm_1.18.bb (renamed from poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb) | 6 |
2 files changed, 12 insertions, 16 deletions
diff --git a/poky/meta/recipes-support/gdbm/files/ptest.patch b/poky/meta/recipes-support/gdbm/files/ptest.patch index b9461bec6..1e67dbd55 100644 --- a/poky/meta/recipes-support/gdbm/files/ptest.patch +++ b/poky/meta/recipes-support/gdbm/files/ptest.patch @@ -1,4 +1,4 @@ -From 4e4b70a4a3dcf1fdbee9e68bed3b62f42b197a3a Mon Sep 17 00:00:00 2001 +From 41448708e163c8ec1f980464e7dd6741db427c8a Mon Sep 17 00:00:00 2001 From: Josep Puigdemont <josep.puigdemont@enea.com> Date: Sun, 4 May 2014 16:02:07 +0200 Subject: [PATCH] Add install-ptest rules. @@ -9,14 +9,14 @@ Upstream-Status: Pending --- Makefile.am | 5 +++++ - tests/Makefile.am | 12 +++++++++++- - 2 files changed, 16 insertions(+), 1 deletion(-) + tests/Makefile.am | 11 +++++++++++ + 2 files changed, 16 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 4cdc734..24b99f0 100644 +index ecc03df..9fbbda5 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -45,3 +45,8 @@ ChangeLog: +@@ -55,3 +55,8 @@ ChangeLog: awk -f $(top_srcdir)/git2chg.awk \ -v append=$(top_srcdir)/$(prev_change_log) > ChangeLog; \ fi @@ -26,14 +26,13 @@ index 4cdc734..24b99f0 100644 + $(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \ + done diff --git a/tests/Makefile.am b/tests/Makefile.am -index 3dbb580..22ffc44 100644 +index dbe17dd..06f537f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -130,4 +130,14 @@ dtfetch_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la - dtdel_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la - d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la +@@ -169,3 +169,14 @@ EXTRA_DIST += \ + gdbmtool/base.exp\ + config/default.exp -- +buildtests: $(check_PROGRAMS) $(TESTSUITE) + +install-ptest: $(check_PROGRAMS) $(TESTSUITE) @@ -45,6 +44,3 @@ index 3dbb580..22ffc44 100644 + $(INSTALL_PROGRAM) $$file $(DESTDIR) ; \ + fi \ + done --- -2.11.0 - diff --git a/poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb b/poky/meta/recipes-support/gdbm/gdbm_1.18.bb index 54e5696e4..aad430095 100644 --- a/poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb +++ b/poky/meta/recipes-support/gdbm/gdbm_1.18.bb @@ -10,8 +10,8 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://ptest.patch \ " -SRC_URI[md5sum] = "c2ddcb3897efa0f57484af2bd4f4f848" -SRC_URI[sha256sum] = "cdceff00ffe014495bed3aed71c7910aa88bf29379f795abc0f46d4ee5f8bc5f" +SRC_URI[md5sum] = "e316f8e4a3e7e4f23955be65d54fec48" +SRC_URI[sha256sum] = "b8822cb4769e2d759c828c06f196614936c88c141c3132b18252fe25c2b635ce" inherit autotools gettext texinfo lib_package ptest @@ -31,7 +31,7 @@ do_install_append () { ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h } -RDEPENDS_${PN}-ptest += "diffutils" +RDEPENDS_${PN}-ptest += "diffutils ${PN}-bin" do_compile_ptest() { oe_runmake -C tests buildtests |