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-core/ncurses | |
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-core/ncurses')
-rw-r--r-- | poky/meta/recipes-core/ncurses/files/0001-tic-hang.patch | 24 | ||||
-rw-r--r-- | poky/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch | 8 | ||||
-rw-r--r-- | poky/meta/recipes-core/ncurses/ncurses.inc | 1 | ||||
-rw-r--r-- | poky/meta/recipes-core/ncurses/ncurses_6.1+20180630.bb (renamed from poky/meta/recipes-core/ncurses/ncurses_6.0+20171125.bb) | 2 |
4 files changed, 18 insertions, 17 deletions
diff --git a/poky/meta/recipes-core/ncurses/files/0001-tic-hang.patch b/poky/meta/recipes-core/ncurses/files/0001-tic-hang.patch index 4a970561d7..f98a943e5c 100644 --- a/poky/meta/recipes-core/ncurses/files/0001-tic-hang.patch +++ b/poky/meta/recipes-core/ncurses/files/0001-tic-hang.patch @@ -1,6 +1,6 @@ -From a95590f676209832fe0b27226e6de3cb50e2b97c Mon Sep 17 00:00:00 2001 +From 168ba7a681be73ac024438e33e14fde1d5aea97d Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 16 Aug 2017 14:31:51 +0800 +Date: Fri, 30 Mar 2018 10:02:24 +0800 Subject: [PATCH 1/2] tic hang Upstream-Status: Inappropriate [configuration] @@ -10,34 +10,34 @@ loop when processing the original file. Signed-off-by: anonymous -Rebase to 6.0+20170715 +Rebase to 6.1 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- misc/terminfo.src | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/misc/terminfo.src b/misc/terminfo.src -index ee3fab3..176d593 100644 +index 84f4810..6b385ec 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src -@@ -5177,12 +5177,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, - # The value for kbs reflects local customization rather than the settings used - # for XFree86 xterm. +@@ -5562,12 +5562,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, + # The value for kbs (see konsole-vt100) reflects local customization rather + # than the settings used for XFree86 xterm. konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, - kend=\EOF, khome=\EOH, use=konsole+pcfkeys, - use=konsole-vt100, --# Konsole does not implement shifted cursor-keys. +- -konsole+pcfkeys|konsole subset of xterm+pcfkeys, -- kLFT@, kRIT@, kcbt=\E[Z, kind@, kri@, kDN@, kUP@, use=xterm+pcc2, -- use=xterm+pcf0, +- kcbt=\E[Z, use=xterm+pcc2, use=xterm+pcf0, +- use=xterm+pce2, + kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R, + kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, + kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~, + kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS, + khome=\EOH, use=konsole-vt100, + + # Obsolete: vt100.keymap # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but - # it is still useful for deriving the other entries. - konsole-vt100|KDE console window with vt100 (sic) keyboard, -- 1.8.3.1 diff --git a/poky/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch b/poky/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch index c47ce6a8cb..572195611e 100644 --- a/poky/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch +++ b/poky/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch @@ -1,4 +1,4 @@ -From 939c994f3756c2d6d3cab2e6a04d05fa7c2b1d56 Mon Sep 17 00:00:00 2001 +From 2a53c03ffa90f0050a949fc5920f0df3e668ff42 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed, 16 Aug 2017 14:45:27 +0800 Subject: [PATCH 2/2] configure: reproducible @@ -10,7 +10,7 @@ build problems" in 2015. Upstream-Status: Pending Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> -Rebase to Rebase to 6.0+20170715 +Rebase to 6.1 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- @@ -18,10 +18,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 7d7d2c1..f444354 100755 +index adead92..fa4fdb7 100755 --- a/configure +++ b/configure -@@ -4458,7 +4458,7 @@ if test "${cf_cv_ar_flags+set}" = set; then +@@ -4503,7 +4503,7 @@ if test "${cf_cv_ar_flags+set}" = set; then else cf_cv_ar_flags=unknown diff --git a/poky/meta/recipes-core/ncurses/ncurses.inc b/poky/meta/recipes-core/ncurses/ncurses.inc index 01e41d5f73..99fc47869e 100644 --- a/poky/meta/recipes-core/ncurses/ncurses.inc +++ b/poky/meta/recipes-core/ncurses/ncurses.inc @@ -87,6 +87,7 @@ ncurses_configure() { --disable-rpath-hack \ ${EXCONFIG_ARGS} \ --with-manpage-format=normal \ + --disable-stripping \ "$@" || return 1 cd .. } diff --git a/poky/meta/recipes-core/ncurses/ncurses_6.0+20171125.bb b/poky/meta/recipes-core/ncurses/ncurses_6.1+20180630.bb index 6c4b96f428..38faf7af28 100644 --- a/poky/meta/recipes-core/ncurses/ncurses_6.0+20171125.bb +++ b/poky/meta/recipes-core/ncurses/ncurses_6.1+20180630.bb @@ -5,7 +5,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://config.cache \ " # commit id corresponds to the revision in package version -SRCREV = "5d849e836052459901cfe0b85a0b2939ff8d2b2a" +SRCREV = "d3b29180ae4360d7ab7a41a15e963299fdb72e33" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" |