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 /meta-openembedded/meta-oe/recipes-support/links | |
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 'meta-openembedded/meta-oe/recipes-support/links')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/links/files/ac-prog-cxx.patch | 24 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb | 53 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/links/links-x11_2.7.bb | 31 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/links/links.inc | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/links/links_2.16.bb (renamed from meta-openembedded/meta-oe/recipes-support/links/links_2.7.bb) | 6 |
5 files changed, 75 insertions, 41 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/links/files/ac-prog-cxx.patch b/meta-openembedded/meta-oe/recipes-support/links/files/ac-prog-cxx.patch index 41c3826850..2dc57a5c83 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/files/ac-prog-cxx.patch +++ b/meta-openembedded/meta-oe/recipes-support/links/files/ac-prog-cxx.patch @@ -1,11 +1,21 @@ ---- links-2.1pre20/configure.in.orig 2005-12-21 15:23:49.000000000 +0000 -+++ links-2.1pre20/configure.in 2005-12-21 15:23:59.000000000 +0000 -@@ -18,7 +18,7 @@ +From c00668541f68c17a5e453a4dcc2a86022b20af87 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Mon, 30 Jul 2012 23:52:49 +0200 + +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 7c15b6b..9896631 100644 +--- a/configure.in ++++ b/configure.in +@@ -23,7 +23,7 @@ AM_CONFIG_HEADER(config.h) dnl Checks for programs. AC_PROG_CC --#AC_PROG_CXX +-dnl AC_PROG_CXX +AC_PROG_CXX - #AC_PROG_AWK - #AM_PROG_LEX - #AC_PROG_YACC + dnl AC_PROG_AWK + dnl AM_PROG_LEX + dnl AC_PROG_YACC diff --git a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb new file mode 100644 index 0000000000..f55a6fc7b3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb @@ -0,0 +1,53 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- COPYING +# +++ COPYING +# @@ -293,7 +293,7 @@ +# <one line to give the program's name and a brief idea of what it does.> +# Copyright (C) <year> <name of author> +# +# - on, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USAThis program is free software; you can redistribute it and/or modify +# + This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# + +require links.inc + +DEPENDS += "virtual/libx11" +RCONFLICTS_${PN} = "links" + +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += " file://links2.desktop \ + http://www.xora.org.uk/oe/links2.png;name=icon" + +S = "${WORKDIR}/links-${PV}" + +EXTRA_OECONF = "--enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --without-fb \ + --without-directfb --without-pmshell --without-atheos \ + --with-x --without-gpm" + +do_install_append() { + install -d ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps +} + +SRC_URI[md5sum] = "645fb0c0294e4c3268f94d307d394ffb" +SRC_URI[sha256sum] = "82f03038d5e050a65681b9888762af41c40fd42dec7e59a8d630bfb0ee134a3f" +SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" +SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.7.bb b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.7.bb deleted file mode 100644 index 2ae11ac97e..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.7.bb +++ /dev/null @@ -1,31 +0,0 @@ -require links.inc - -DEPENDS += "virtual/libx11" -RCONFLICTS_${PN} = "links" - -inherit distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://links2.desktop \ - http://www.xora.org.uk/oe/links2.png;name=icon" - -S = "${WORKDIR}/links-${PV}" - -EXTRA_OECONF = "--enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --without-fb \ - --without-directfb --without-pmshell --without-atheos \ - --with-x --without-gpm" - -do_install_append() { - install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps -} - -SRC_URI[md5sum] = "d06aa6e14b2172d73188871a5357185a" -SRC_URI[sha256sum] = "0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130" -SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" -SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-openembedded/meta-oe/recipes-support/links/links.inc b/meta-openembedded/meta-oe/recipes-support/links/links.inc index e072408206..d6aa2d2d4e 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links.inc +++ b/meta-openembedded/meta-oe/recipes-support/links/links.inc @@ -3,7 +3,7 @@ browser, similar to Lynx." HOMEPAGE = "http://links.twibright.com/" SECTION = "console/network" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=65e735be2e05d5943803344148f57603" +LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff" DEPENDS = "jpeg libpng flex openssl zlib" SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ diff --git a/meta-openembedded/meta-oe/recipes-support/links/links_2.7.bb b/meta-openembedded/meta-oe/recipes-support/links/links_2.16.bb index e80dd7bca3..19ea7a67ba 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links_2.16.bb @@ -9,5 +9,7 @@ EXTRA_OECONF = "--enable-graphics \ --without-directfb --without-pmshell --without-atheos \ --without-x" -SRC_URI[md5sum] = "d06aa6e14b2172d73188871a5357185a" -SRC_URI[sha256sum] = "0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130" +SRC_URI[md5sum] = "645fb0c0294e4c3268f94d307d394ffb" +SRC_URI[sha256sum] = "82f03038d5e050a65681b9888762af41c40fd42dec7e59a8d630bfb0ee134a3f" +SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" +SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" |