Skip to contentSkip to conversation

Package Updates

PATCH Superseded Saul Wold 3 participants 17 messages Jan 6, 2015 – Jan 9, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
author
#1 lore raw

PATCH 1/12 usbutils: Add version 008

In reply to Saul Wold

The latest version of usbutil (v008) uses the latest version of udev (v196 or greater) which is only available as part of the systemd package. So add systemd as a DEPENDS and REQUIRED_DISTRO_FEATURE.

Add v008 version of iconv.patch

COPYING file is GPLv2, but has newer formatting and address change.

---
 meta/recipes-bsp/usbutils/usbutils-008/iconv.patch | 41 ++++++++++++++++++++++
 meta/recipes-bsp/usbutils/usbutils_008.bb          | 35 ++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 meta/recipes-bsp/usbutils/usbutils-008/iconv.patch
 create mode 100644 meta/recipes-bsp/usbutils/usbutils_008.bb
meta/recipes-bsp/usbutils/usbutils-008/iconv.patch new file +41 -0
new file mode 100644
index 0000000..6455567
@@ -0,0 +1,41 @@
+This patch adds support for detecting iconv support using autotools
+uclibc does not have iconv implementation inside libc like glibc, therefore
+the existing checks were not sufficient, it worked for glibc but not for
+uclibc. The new patch portably detects the iconv support and adds the
+libiconv to linker cmdline
+
+This patch should be submitted upstream too
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Index: usbutils-008/configure.ac
+===================================================================
+--- usbutils-008.orig/configure.ac
++++ usbutils-008/configure.ac
+@@ -10,7 +10,9 @@ AC_USE_SYSTEM_EXTENSIONS
+ AC_SYS_LARGEFILE
+ 
+ AC_CHECK_HEADERS([byteswap.h])
+-AC_CHECK_FUNCS([nl_langinfo iconv])
++
++AM_GNU_GETTEXT
++AM_ICONV
+ 
+ PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0)
+ 
+Index: usbutils-008/Makefile.am
+===================================================================
+--- usbutils-008.orig/Makefile.am
++++ usbutils-008/Makefile.am
+@@ -29,7 +29,8 @@ lsusb_CPPFLAGS = \
+ 
+ lsusb_LDADD = \
+ 	$(LIBUSB_LIBS) \
+-	$(UDEV_LIBS)
++	$(UDEV_LIBS) \
++	$(LIBICONV)
+ 
+ man_MANS = \
+ 	lsusb.8	\
meta/recipes-bsp/usbutils/usbutils_008.bb new file +35 -0
new file mode 100644
index 0000000..afc6ea3
@@ -0,0 +1,35 @@
+SUMMARY = "Host side USB console utilities"
+DESCRIPTION = "Contains the lsusb utility for inspecting the devices connected to the USB bus."
+HOMEPAGE = "http://www.linux-usb.org"
+SECTION = "base"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+DEPENDS = "libusb zlib virtual/libiconv systemd"
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
+           file://usb-devices-avoid-dependency-on-bash.patch \
+           file://Fix-NULL-pointer-crash.patch \
+           file://iconv.patch \
+          "
+
+RC_URI[md5sum] = "cb20148c2e784577e924a7b4c560c8fb"
+SRC_URI[sha256sum] = "6d5f16c2961df37e22e492c736a3e162a8fde24480f23a40d85f79af80d3fe95"
+
+inherit autotools gettext pkgconfig distro_features_check
+# This version of usbutils relies on the udev from systemd, so unless 
+# we can decouple udev from system, we require systemd for now.
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+do_install_append() {
+	# We only need the compressed copy, remove the uncompressed version
+	rm -f ${D}${datadir}/usb.ids
+}
+
+PACKAGES += "${PN}-ids"
+FILES_${PN}-dev += "${datadir}/pkgconfig"
+FILES_${PN}-ids = "${datadir}/usb*"
+
+RDEPENDS_${PN} = "${PN}-ids libudev"
+RDEPENDS_${PN}-ptest = "libboost-system libboost-thread"
Signature · 1 line
2.1.0
author
#3 lore raw

PATCH 2/12 gnupg: Upgrade to 2.1.0

In reply to Saul Wold

Add patch to use pkg-config instead of npth-config and remove --without-curl as it's not used anymore.

Also needed a patch to add libgpg-error to correctly build dirmngr

---
 .../gnupg/gnupg/dirmngr-uses-libgpg-error.patch    | 16 +++++
 meta/recipes-support/gnupg/gnupg/pkgconfig.patch   | 24 +++++---
 .../use-pkgconfig-instead-of-npth-config.patch     | 72 ++++++++++++++++++++++
 .../gnupg/{gnupg_2.0.26.bb => gnupg_2.1.0.bb}      | 16 ++---
 4 files changed, 111 insertions(+), 17 deletions(-)
 create mode 100644 meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
 create mode 100644 meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch
 rename meta/recipes-support/gnupg/{gnupg_2.0.26.bb => gnupg_2.1.0.bb} (70%)
meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch new file +16 -0
new file mode 100644
index 0000000..3dc506c
@@ -0,0 +1,16 @@
+Upstream-Status: Pending
+Signed-off-by: Saul Wold <[email protected]>
+Index: gnupg-2.1.0/dirmngr/Makefile.am
+===================================================================
+--- gnupg-2.1.0.orig/dirmngr/Makefile.am
++++ gnupg-2.1.0/dirmngr/Makefile.am
+@@ -71,7 +71,8 @@ endif
+ dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \
+         ../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \
+ 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
+-	$(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV)
++	$(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \
++        $(GPG_ERROR_LIBS)
+ if !USE_LDAPWRAPPER
+ dirmngr_LDADD += $(ldaplibs)
+ endif
meta/recipes-support/gnupg/gnupg/pkgconfig.patch +14 -10
index ae92392..5e036ba 100644
@@ -5,11 +5,11 @@ Upstream-Status: Rejected
 
 RP 2014/5/22
 
-Index: gnupg-2.0.22/m4/gnupg-pth.m4
+Index: gnupg-2.1.0/m4/gnupg-pth.m4
 ===================================================================
---- gnupg-2.0.22.orig/m4/gnupg-pth.m4	2013-10-04 12:32:53.000000000 +0000
-+++ gnupg-2.0.22/m4/gnupg-pth.m4	2014-05-13 21:33:21.000000000 +0000
-@@ -17,33 +17,9 @@
+--- gnupg-2.1.0.orig/m4/gnupg-pth.m4
++++ gnupg-2.1.0/m4/gnupg-pth.m4
+@@ -17,33 +17,9 @@ dnl implied warranty of MERCHANTABILITY
  # Taken and modified from the m4 macros which come with Pth.
  AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
    [
@@ -44,7 +44,7 @@ Index: gnupg-2.0.22/m4/gnupg-pth.m4
      if test $have_pth = yes; then
         AC_MSG_RESULT(yes)
         AC_MSG_CHECKING([whether PTH installation is sane])
-@@ -51,9 +29,9 @@
+@@ -51,9 +27,9 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
           _gnupg_pth_save_cflags=$CFLAGS
           _gnupg_pth_save_ldflags=$LDFLAGS
           _gnupg_pth_save_libs=$LIBS
@@ -57,30 +57,34 @@ Index: gnupg-2.0.22/m4/gnupg-pth.m4
           AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h>
                                           ],
                                           [[ pth_init ();]])],
-@@ -81,23 +59,11 @@
+@@ -80,26 +56,13 @@ AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
+ # PTH_CLFAGS and PTH_LIBS are AS_SUBST.
  #
  AC_DEFUN([GNUPG_PATH_PTH],
-+[
 -[ AC_ARG_WITH(pth-prefix,
 -             AC_HELP_STRING([--with-pth-prefix=PFX],
--                           [prefix where GNU Pth is installed]),
+-                           [prefix where GNU Pth is installed (optional)]),
 -     pth_config_prefix="$withval", pth_config_prefix="")
 -  if test x$pth_config_prefix != x ; then
 -     PTH_CONFIG="$pth_config_prefix/bin/pth-config"
 -  fi
 -  AC_PATH_PROG(PTH_CONFIG, pth-config, no)
++[
    tmp=ifelse([$1], ,1.3.7,$1)
 -  if test "$PTH_CONFIG" != "no"; then
 -    GNUPG_PTH_VERSION_CHECK($tmp)
--    if test $have_pth = yes; then
+-    if test $have_pth = yes; then      
 -       PTH_CFLAGS=`$PTH_CONFIG --cflags`
 -       PTH_LIBS=`$PTH_CONFIG --ldflags`
 -       PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`"
+-       AC_DEFINE(HAVE_PTH, 1,
 +  GNUPG_PTH_VERSION_CHECK($tmp)
 +  if test $have_pth = yes; then
-        AC_DEFINE(HAVE_PTH, 1,
++      AC_DEFINE(HAVE_PTH, 1,
                  [Defined if the GNU Pth is available])
 -    fi
    fi
    AC_SUBST(PTH_CFLAGS)
    AC_SUBST(PTH_LIBS)
+ ])
+-
meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch new file +72 -0

72 lines not on this page · raw message

meta/recipes-support/gnupg/gnupg_2.1.0.bb renamed from meta/recipes-support/gnupg/gnupg_2.0.26.bb +9 -7
similarity index 70%
rename from meta/recipes-support/gnupg/gnupg_2.0.26.bb
rename to meta/recipes-support/gnupg/gnupg_2.1.0.bb
index 92dd3bd..e9ade3b 100644
@@ -4,21 +4,21 @@ LICENSE = "GPLv3 & LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
                     file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
 
-DEPENDS = "${PTH} libassuan libksba zlib bzip2 readline libgcrypt"
-PTH = "pth"
-PTH_libc-uclibc = "npth"
+DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt"
 
 inherit autotools gettext texinfo pkgconfig
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
-           file://pkgconfig.patch"
+           file://pkgconfig.patch \
+           file://use-pkgconfig-instead-of-npth-config.patch \
+           file://dirmngr-uses-libgpg-error.patch \
+          "
 
-SRC_URI[md5sum] = "fa7e704aad33eb114d1840164455aec1"
-SRC_URI[sha256sum] = "7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0"
+SRC_URI[md5sum] = "43a809789a1d897f4386680be0b09d02"
+SRC_URI[sha256sum] = "16a8c3f50a15bf37d2dfb1c5e4bb3ec533e1d0b6a4043ff3680a376a3ad4058b"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \
-                --without-libcurl \
 		--with-zlib=${STAGING_LIBDIR}/.. \
 		--with-bzip2=${STAGING_LIBDIR}/.. \
                 --with-readline=${STAGING_LIBDIR}/.. \
@@ -37,3 +37,5 @@ do_install_append() {
 	ln -sf gpg2 ${D}${bindir}/gpg
 	ln -sf gpgv2 ${D}${bindir}/gpgv
 }
+
+RDEPENDS_${PN} = "gnutls"
Signature · 1 line
2.1.0

Saul Wold

author
#0 lore raw

cover Package Updates

Ross, Richard:

Here is another set up updates, built and tested on both Autobuilder and locally. This address the issues with libgpg-error for fsl also.

Sau!

The following changes since commit 24f19fedb40d0af84beb8e9a6595ea06f09d4615:

gstreamer1.0-omx: use mulitple SCMs to fetch submodules (2014-12-31 08:22:53 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib 5149fba599906379ad08516e540c8b3e6f467e2f
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

André Draszik (1):
openssl: fix hard paths in native openssl

Saul Wold (11):
usbutils: Add version 008
gnupg: Upgrade to 2.1.0
syslinux: Update to 6.0.3
gnu-efi: Upgrade to 3.0w
json-c: Upgrade to 0.12
lsbinitscripts: Upgrade to 9.60
libffi: Upgrade to 3.2.1
libassuan: Upgrade to 2.2.0
libksba: Upgrade to 1.3.2
liburcu: Upgrade to 0.8.6
libgpg-error: Update to 1.17

 .../gnu-efi/{gnu-efi_3.0u.bb => gnu-efi_3.0w.bb}   |   1 +
 meta/recipes-bsp/usbutils/usbutils-008/iconv.patch |  41 ++
 meta/recipes-bsp/usbutils/usbutils_008.bb          |  35 ++
 meta/recipes-connectivity/openssl/openssl.inc      |   9 +-
 .../json-c/{json-c_0.11.bb => json-c_0.12.bb}      |   6 +-
 ...dd-SMT_TERMINAL-a-last-resort-region-type.patch |  50 ---
 ...an-build-a-linked-list-of-memory-scanners.patch | 450 ---------------------
 .../0003-PXELINUX-Add-bios-memscan-function.patch  |  87 ----
 ...s_fbm-and-real_base_mem-to-calculate-free.patch |  65 ---
 .../isohybrid-fix-overflow-on-32-bit-system.patch  |  40 --
 .../syslinux-fix-parallel-building-issue.patch     |  17 +-
 .../syslinux-libupload-depend-lib.patch            |   0
 .../syslinux/syslinux-remove-clean-script.patch    |  17 +
 .../{syslinux_6.01.bb => syslinux_6.03.bb}         |  12 +-
 ...nitscripts_9.56.1.bb => lsbinitscripts_9.60.bb} |   6 +-
 .../libffi/{libffi_3.1.bb => libffi_3.2.1.bb}      |   4 +-
 .../gnupg/gnupg/dirmngr-uses-libgpg-error.patch    |  16 +
 meta/recipes-support/gnupg/gnupg/pkgconfig.patch   |  24 +-
 .../use-pkgconfig-instead-of-npth-config.patch     |  72 ++++
 .../gnupg/{gnupg_2.0.26.bb => gnupg_2.1.0.bb}      |  16 +-
 .../{libassuan_2.1.2.bb => libassuan_2.2.0.bb}     |   4 +-
 .../pkgconfig.patch                                |  67 +--
 .../{libgpg-error_1.12.bb => libgpg-error_1.17.bb} |  35 +-
 .../libksba/{libksba_1.3.1.bb => libksba_1.3.2.bb} |   4 +-
 .../liburcu/{files => liburcu}/aarch64.patch       |   0
 .../liburcu/{liburcu_0.8.5.bb => liburcu_0.8.6.bb} |   4 +-
 26 files changed, 311 insertions(+), 771 deletions(-)
 rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0u.bb => gnu-efi_3.0w.bb} (99%)
 create mode 100644 meta/recipes-bsp/usbutils/usbutils-008/iconv.patch
 create mode 100644 meta/recipes-bsp/usbutils/usbutils_008.bb
 rename meta/recipes-devtools/json-c/{json-c_0.11.bb => json-c_0.12.bb} (75%)
 delete mode 100644 meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch
 delete mode 100644 meta/recipes-devtools/syslinux/files/0002-memscan-build-a-linked-list-of-memory-scanners.patch
 delete mode 100644 meta/recipes-devtools/syslinux/files/0003-PXELINUX-Add-bios-memscan-function.patch
 delete mode 100644 meta/recipes-devtools/syslinux/files/0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch
 delete mode 100644 meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch
 rename meta/recipes-devtools/syslinux/{files => syslinux}/syslinux-fix-parallel-building-issue.patch (75%)
 rename meta/recipes-devtools/syslinux/{files => syslinux}/syslinux-libupload-depend-lib.patch (100%)
 create mode 100644 meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch
 rename meta/recipes-devtools/syslinux/{syslinux_6.01.bb => syslinux_6.03.bb} (84%)
 rename meta/recipes-extended/lsb/{lsbinitscripts_9.56.1.bb => lsbinitscripts_9.60.bb} (78%)
 rename meta/recipes-gnome/libffi/{libffi_3.1.bb => libffi_3.2.1.bb} (88%)
 create mode 100644 meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
 create mode 100644 meta/recipes-support/gnupg/gnupg/use-pkgconfig-instead-of-npth-config.patch
 rename meta/recipes-support/gnupg/{gnupg_2.0.26.bb => gnupg_2.1.0.bb} (70%)
 rename meta/recipes-support/libassuan/{libassuan_2.1.2.bb => libassuan_2.2.0.bb} (86%)
 rename meta/recipes-support/libgpg-error/{libgpg-error-1.12 => libgpg-error}/pkgconfig.patch (70%)
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.12.bb => libgpg-error_1.17.bb} (40%)
 rename meta/recipes-support/libksba/{libksba_1.3.1.bb => libksba_1.3.2.bb} (86%)
 rename meta/recipes-support/liburcu/{files => liburcu}/aarch64.patch (100%)
 rename meta/recipes-support/liburcu/{liburcu_0.8.5.bb => liburcu_0.8.6.bb} (83%)
Signature · 1 line
2.1.0
author
#4 lore raw

PATCH 3/12 syslinux: Update to 6.0.3

Removed patches that are now committed upstream, rebase parallel make patch and add a new patch to remove a script that was calling git during the clean process.

---
 ...dd-SMT_TERMINAL-a-last-resort-region-type.patch |  50 ---
 ...an-build-a-linked-list-of-memory-scanners.patch | 450 ---------------------
 .../0003-PXELINUX-Add-bios-memscan-function.patch  |  87 ----
 ...s_fbm-and-real_base_mem-to-calculate-free.patch |  65 ---
 .../isohybrid-fix-overflow-on-32-bit-system.patch  |  40 --
 .../syslinux-fix-parallel-building-issue.patch     |  17 +-
 .../syslinux-libupload-depend-lib.patch            |   0
 .../syslinux/syslinux-remove-clean-script.patch    |  17 +
 .../{syslinux_6.01.bb => syslinux_6.03.bb}         |  12 +-
 9 files changed, 28 insertions(+), 710 deletions(-)
 delete mode 100644 meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch
 delete mode 100644 meta/recipes-devtools/syslinux/files/0002-memscan-build-a-linked-list-of-memory-scanners.patch
 delete mode 100644 meta/recipes-devtools/syslinux/files/0003-PXELINUX-Add-bios-memscan-function.patch
 delete mode 100644 meta/recipes-devtools/syslinux/files/0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch
 delete mode 100644 meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch
 rename meta/recipes-devtools/syslinux/{files => syslinux}/syslinux-fix-parallel-building-issue.patch (75%)
 rename meta/recipes-devtools/syslinux/{files => syslinux}/syslinux-libupload-depend-lib.patch (100%)
 create mode 100644 meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch
 rename meta/recipes-devtools/syslinux/{syslinux_6.01.bb => syslinux_6.03.bb} (84%)
meta/recipes-devtools/syslinux/files/0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch deleted +0 -50
deleted file mode 100644
index fb03bbf..0000000
@@ -1,50 +0,0 @@
-Upstream-Status: Backport [ba638fd9bf72b0c786c88909014136cfa641a147]
-Signed-off-by: Jonathan Liu <[email protected]>
-
-From b663fd7257481438256f8267831dc10b06363b22 Mon Sep 17 00:00:00 2001
-From: Matt Fleming <[email protected]>
-Date: Tue, 16 Jul 2013 22:16:11 +0100
-Subject: [PATCH 1/4] movebits: Add SMT_TERMINAL - a last resort region type
-
-Some memory regions are usable, but only as a last resort just before we
-hand over control to a kernel image. Add the necessary movebits
-infrastructure to use these regions when all other options have been
-exhausted.
-
-Signed-off-by: Matt Fleming <[email protected]>
-
-Conflicts:
-	com32/lib/syslinux/zonelist.c
----
- com32/include/syslinux/movebits.h | 1 +
- com32/lib/syslinux/movebits.c     | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/com32/include/syslinux/movebits.h b/com32/include/syslinux/movebits.h
-index 8bcdf3e..114a896 100644
---- a/com32/include/syslinux/movebits.h
-+++ b/com32/include/syslinux/movebits.h
-@@ -34,6 +34,7 @@ enum syslinux_memmap_types {
-     SMT_RESERVED,		/* Unusable memory */
-     SMT_ALLOC,			/* Memory allocated by user */
-     SMT_ZERO,			/* Memory that should be zeroed */
-+    SMT_TERMINAL,		/* Memory to be used as a last resort */
- };
- 
- struct syslinux_memmap {
-diff --git a/com32/lib/syslinux/movebits.c b/com32/lib/syslinux/movebits.c
-index 7a05f3c..8ffdc63 100644
---- a/com32/lib/syslinux/movebits.c
-+++ b/com32/lib/syslinux/movebits.c
-@@ -160,7 +160,7 @@ static const struct syslinux_memmap *is_free_zone(const struct syslinux_memmap
- 	if (list->start <= start) {
- 	    if (llast >= last) {
- 		/* Chunk has a single, well-defined type */
--		if (list->type == SMT_FREE) {
-+		if (list->type == SMT_FREE || list->type == SMT_TERMINAL) {
- 		    dprintf("F: 0x%08x bytes at 0x%08x\n",
- 			    list->next->start, list->start);
- 		    return list;	/* It's free */
--- 
-1.8.5.3
-
meta/recipes-devtools/syslinux/files/0002-memscan-build-a-linked-list-of-memory-scanners.patch deleted +0 -450

450 lines not on this page · raw message

meta/recipes-devtools/syslinux/files/0003-PXELINUX-Add-bios-memscan-function.patch deleted +0 -87

87 lines not on this page · raw message

meta/recipes-devtools/syslinux/files/0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch deleted +0 -65

65 lines not on this page · raw message

meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch deleted +0 -40
deleted file mode 100644
index 09a6945..0000000
@@ -1,40 +0,0 @@
-Upstream-Status: Backport
-
-Signed-off-by: Kai Kang <[email protected]>
-
-From bc360f8dbdf27bff07bb5db8d0ea9a7b10d8e3d1 Mon Sep 17 00:00:00 2001
-From: Kai Kang <[email protected]>
-Date: Fri, 20 Jun 2014 11:32:11 +0800
-Subject: [PATCH 1/2] isohybrid: fix overflow on 32 bit system
-
-When call isohybrid with option '-u', it overflows on a 32 bits host. It
-seeks to 512 bytes before the end of the image to install gpt header. If
-the size of image is larger than LONG_MAX, it overflows fseek() and
-cause error:
-
-isohybrid: image-x86-64-20140505110100.iso: seek error - 8: Invalid argument
-
-Replace fseek with fseeko to fix this issue.
-
-Signed-off-by: Kai Kang <[email protected]>
-Signed-off-by: H. Peter Anvin <[email protected]>
----
- utils/isohybrid.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/isohybrid.c b/utils/isohybrid.c
-index 410bb60..23fc6c0 100644
---- a/utils/isohybrid.c
-+++ b/utils/isohybrid.c
-@@ -1126,7 +1126,7 @@ main(int argc, char *argv[])
- 	 * end of the image
- 	 */
- 
--	if (fseek(fp, (isostat.st_size + padding) - orig_gpt_size - 512,
-+	if (fseeko(fp, (isostat.st_size + padding) - orig_gpt_size - 512,
- 		  SEEK_SET))
- 	    err(1, "%s: seek error - 8", argv[0]);
- 
--- 
-1.9.1
-
meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch renamed from meta/recipes-devtools/syslinux/files/syslinux-fix-parallel-building-issue.patch +7 -10
similarity index 75%
rename from meta/recipes-devtools/syslinux/files/syslinux-fix-parallel-building-issue.patch
rename to meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch
index 6b69579..312b1e8 100644
@@ -24,15 +24,12 @@ Signed-off-by: Chong Lu <[email protected]>
  com32/Makefile |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/com32/Makefile b/com32/Makefile
-index 7ea1b01..9a1721b 100644
---- a/com32/Makefile
-+++ b/com32/Makefile
-@@ -20,3 +20,4 @@ modules: lib libutil gpllib
- rosh: lib libutil
+Index: syslinux-6.03/com32/Makefile
+===================================================================
+--- syslinux-6.03.orig/com32/Makefile
++++ syslinux-6.03/com32/Makefile
+@@ -21,3 +21,4 @@ rosh: lib libutil
  samples: libutil elflink/ldlinux
- sysdump: libupload gpllib
+ sysdump: lib libutil libupload gpllib
+ lua/src: cmenu modules
 +gpllib: lib
--- 
-1.7.9.5
-
meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch renamed from meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch +0 -0
similarity index 100%
rename from meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch
rename to meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch new file +17 -0
new file mode 100644
index 0000000..7c003e1
@@ -0,0 +1,17 @@
+This script try to call git submodule, since we are downloading
+the tarball it seems in-correct to do this.
+
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Saul Wold <[email protected]>
+Index: syslinux-6.03/efi/Makefile
+===================================================================
+--- syslinux-6.03.orig/efi/Makefile
++++ syslinux-6.03/efi/Makefile
+@@ -101,7 +101,6 @@ tidy dist:
+ 	rm -f *.so *.o wrapper
+ 	find . \( -name \*.o -o -name \*.a -o -name .\*.d -o -name \*.tmp \) -print0 | \
+ 		xargs -0r rm -f
+-	$(topdir)/efi/clean-gnu-efi.sh $(EFI_SUBARCH) $(objdir)
+ 
+ clean: tidy
+ 
meta/recipes-devtools/syslinux/syslinux_6.03.bb renamed from meta/recipes-devtools/syslinux/syslinux_6.01.bb +4 -8
similarity index 84%
rename from meta/recipes-devtools/syslinux/syslinux_6.01.bb
rename to meta/recipes-devtools/syslinux/syslinux_6.03.bb
index 20afae9..7e3176e 100644
@@ -8,18 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 # ldlinux.* stuff for now, so skip mtools-native
 DEPENDS = "nasm-native util-linux"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar.bz2 \
-           file://0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch \
-           file://0002-memscan-build-a-linked-list-of-memory-scanners.patch \
-           file://0003-PXELINUX-Add-bios-memscan-function.patch \
-           file://0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch \
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar.xz \
            file://syslinux-fix-parallel-building-issue.patch \
-           file://isohybrid-fix-overflow-on-32-bit-system.patch \
            file://syslinux-libupload-depend-lib.patch \
+           file://syslinux-remove-clean-script.patch \
            "
 
-SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534"
-SRC_URI[sha256sum] = "83a04cf81e6a46b80ee5a321926eea095af3498b04317e3674b46c125c7a5b43"
+SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13"
+SRC_URI[sha256sum] = "26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e"
 
 COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
 # Don't let the sanity checker trip on the 32 bit real mode BIOS binaries
Signature · 1 line
2.1.0
author
#5 lore raw

PATCH 4/12 openssl: fix hard paths in native openssl

In reply to Saul Wold

From: André Draszik <[email protected]>

This causes the package to not be relocateable from sstate

The OpenSSL binaries respect a few environment variables for determining locations of files, so we now use these to point the binaries to the relocated locations.

[YOCTO #6827]

---
 meta/recipes-connectivity/openssl/openssl.inc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
meta/recipes-connectivity/openssl/openssl.inc +8 -1
index 9ec884f..31dfd8f 100644
@@ -193,5 +193,12 @@ do_install_ptest () {
 	install util/shlib_wrap.sh     ${D}${PTEST_PATH}/util
 }
 
-BBCLASSEXTEND = "native nativesdk"
+do_install_append_virtclass-native() {
+	create_wrapper ${D}${bindir}/openssl \
+	    OPENSSL_CONF=${libdir}/ssl/openssl.cnf \
+	    SSL_CERT_DIR=${libdir}/ssl/certs \
+	    SSL_CERT_FILE=${libdir}/ssl/cert.pem \
+	    OPENSSL_ENGINES=${libdir}/ssl/engines
+}
 
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.1.0
author
#6 lore raw

PATCH 5/12 gnu-efi: Upgrade to 3.0w

In reply to Saul Wold
---
 meta/recipes-bsp/gnu-efi/{gnu-efi_3.0u.bb => gnu-efi_3.0w.bb} | 1 +
 1 file changed, 1 insertion(+)
 rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0u.bb => gnu-efi_3.0w.bb} (99%)
meta/recipes-bsp/gnu-efi/gnu-efi_3.0w.bb renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb +1 -0
similarity index 99%
rename from meta/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb
rename to meta/recipes-bsp/gnu-efi/gnu-efi_3.0w.bb
index dbf2a07..e854245 100644
@@ -8,6 +8,7 @@ SRC_URI = "http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0u.orig.tar.gz \
            file://parallel-make.patch \
            file://parallel-make-archives.patch \
           "
+
 SRC_URI[md5sum] = "d15d3c700e79a1e2938544d73edc572d"
 SRC_URI[sha256sum] = "3c0d450d5829204ca05dcb3b2aae772e52c379b7c7e09146759c6315606f934e"
 
Signature · 1 line
2.1.0
author
#9 lore raw

PATCH 6/12 json-c: Upgrade to 0.12

In reply to Saul Wold

Added CFLAGS to prevent compiler error of unused size variable

---
 meta/recipes-devtools/json-c/{json-c_0.11.bb => json-c_0.12.bb} | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/json-c/{json-c_0.11.bb => json-c_0.12.bb} (75%)
meta/recipes-devtools/json-c/json-c_0.12.bb renamed from meta/recipes-devtools/json-c/json-c_0.11.bb +4 -2
similarity index 75%
rename from meta/recipes-devtools/json-c/json-c_0.11.bb
rename to meta/recipes-devtools/json-c/json-c_0.12.bb
index 389e0f9..79cf6dc 100644
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
 
 SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "aa02367d2f7a830bf1e3376f77881e98"
-SRC_URI[sha256sum] = "28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c"
+SRC_URI[md5sum] = "3ca4bbb881dfc4017e8021b5e0a8c491"
+SRC_URI[sha256sum] = "000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f"
 
 RPROVIDES_${PN} = "libjson"
 
@@ -19,3 +19,5 @@ do_configure_prepend() {
     # Clean up autoconf cruft that should not be in the tarball
     rm -f ${S}/config.status
 }
+
+CFLAGS += "-Wno-error=unused-but-set-variable"
Signature · 1 line
2.1.0
author
#11 lore raw

PATCH 7/12 lsbinitscripts: Upgrade to 9.60

In reply to Saul Wold
---
 .../lsb/{lsbinitscripts_9.56.1.bb => lsbinitscripts_9.60.bb}        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/lsb/{lsbinitscripts_9.56.1.bb => lsbinitscripts_9.60.bb} (78%)
meta/recipes-extended/lsb/lsbinitscripts_9.60.bb renamed from meta/recipes-extended/lsb/lsbinitscripts_9.56.1.bb +3 -3
similarity index 78%
rename from meta/recipes-extended/lsb/lsbinitscripts_9.56.1.bb
rename to meta/recipes-extended/lsb/lsbinitscripts_9.60.bb
index cf3a863..1490582 100644
@@ -6,12 +6,12 @@ DEPENDS = "popt glib-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
 
 S="${WORKDIR}/initscripts-${PV}"
-SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.56.1.tar.bz2/8ca2abb3877e8019a5e726c25501e8e3/initscripts-9.56.1.tar.bz2 \
+SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-9.60.tar.bz2/5c9cd83e4e04257fef3ffd8e549b7f81/initscripts-9.60.tar.bz2 \
            file://functions.patch \
           " 
 
-SRC_URI[md5sum] = "8ca2abb3877e8019a5e726c25501e8e3"
-SRC_URI[sha256sum] = "e6fbe1daa5cbfc6fab12ccac2955bde0c16ec8d9fbdb9f7c6c33fadc81da6574"
+SRC_URI[md5sum] = "5c9cd83e4e04257fef3ffd8e549b7f81"
+SRC_URI[sha256sum] = "254508884ceeef22e24f4e8b051bb51958ae8252bd7b02cd2b7bcce3fb453dc2"
 
 inherit update-alternatives
 
Signature · 1 line
2.1.0
author
#12 lore raw

PATCH 8/12 libffi: Upgrade to 3.2.1

In reply to Saul Wold
---
 meta/recipes-gnome/libffi/{libffi_3.1.bb => libffi_3.2.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/libffi/{libffi_3.1.bb => libffi_3.2.1.bb} (88%)
meta/recipes-gnome/libffi/libffi_3.2.1.bb renamed from meta/recipes-gnome/libffi/libffi_3.1.bb +2 -2
similarity index 88%
rename from meta/recipes-gnome/libffi/libffi_3.1.bb
rename to meta/recipes-gnome/libffi/libffi_3.2.1.bb
index bc97aba..2302810 100644
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b"
 SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \
            file://fix-libffi.la-location.patch"
 
-SRC_URI[md5sum] = "f5898b29bbfd70502831a212d9249d10"
-SRC_URI[sha256sum] = "97feeeadca5e21870fa4433bc953d1b3af3f698d5df8a428f68b73cd60aef6eb"
+SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
+SRC_URI[sha256sum] = "d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"
 
 EXTRA_OECONF += "--disable-builddir"
 
Signature · 1 line
2.1.0
author
#13 lore raw

PATCH 9/12 libassuan: Upgrade to 2.2.0

In reply to Saul Wold
---
 .../libassuan/{libassuan_2.1.2.bb => libassuan_2.2.0.bb}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libassuan/{libassuan_2.1.2.bb => libassuan_2.2.0.bb} (86%)
meta/recipes-support/libassuan/libassuan_2.2.0.bb renamed from meta/recipes-support/libassuan/libassuan_2.1.2.bb +2 -2
similarity index 86%
rename from meta/recipes-support/libassuan/libassuan_2.1.2.bb
rename to meta/recipes-support/libassuan/libassuan_2.2.0.bb
index 97dec6a..5fc8b8c 100644
@@ -13,8 +13,8 @@ DEPENDS = "libgpg-error"
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \
 	   file://libassuan-add-pkgconfig-support.patch"
 
-SRC_URI[md5sum] = "1dc4c3e1dbfb3939bfa2d72db8e136ba"
-SRC_URI[sha256sum] = "39f8a7c9349aaaf7ccd937b90660153ec4d2d4df2465018754e5bcae5b1db77b"
+SRC_URI[md5sum] = "a104faed3e97b9c302c5d67cc22b1d60"
+SRC_URI[sha256sum] = "7df58ed70be4b694f77efd1f3b3f103c6311b6b71e04a370382f9fe8204f6ec6"
 
 BINCONFIG = "${bindir}/libassuan-config"
 
Signature · 1 line
2.1.0
author
#14 lore raw

PATCH 10/12 libksba: Upgrade to 1.3.2

In reply to Saul Wold
---
 meta/recipes-support/libksba/{libksba_1.3.1.bb => libksba_1.3.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libksba/{libksba_1.3.1.bb => libksba_1.3.2.bb} (86%)
meta/recipes-support/libksba/libksba_1.3.2.bb renamed from meta/recipes-support/libksba/libksba_1.3.1.bb +2 -2
similarity index 86%
rename from meta/recipes-support/libksba/libksba_1.3.1.bb
rename to meta/recipes-support/libksba/libksba_1.3.2.bb
index 6950dbb..cce08c3 100644
@@ -16,8 +16,8 @@ inherit autotools binconfig-disabled pkgconfig texinfo
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://ksba-add-pkgconfig-support.patch"
 
-SRC_URI[md5sum] = "9be95245fcfa9d56f56853078ef2650b"
-SRC_URI[sha256sum] = "bc96b95516bd2b67f413bc8b5cc5a75a2583c6e666d24dfd0d5bcc6b1aab46f9"
+SRC_URI[md5sum] = "c3c9a66e22d87fe3ae59865250b8a09c"
+SRC_URI[sha256sum] = "eb95537955dfc2845690a4cc3836074fa6d0a2c2ca2cbf1759364d3bd9868406"
 
 do_configure_prepend () {
 	# Else these could be used in preference to those in aclocal-copy
Signature · 1 line
2.1.0
author
#15 lore raw

PATCH 11/12 liburcu: Upgrade to 0.8.6

In reply to Saul Wold

Move patches from files to liburcu directory

---
 meta/recipes-support/liburcu/{files => liburcu}/aarch64.patch       | 0
 meta/recipes-support/liburcu/{liburcu_0.8.5.bb => liburcu_0.8.6.bb} | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/liburcu/{files => liburcu}/aarch64.patch (100%)
 rename meta/recipes-support/liburcu/{liburcu_0.8.5.bb => liburcu_0.8.6.bb} (83%)
meta/recipes-support/liburcu/liburcu/aarch64.patch renamed from meta/recipes-support/liburcu/files/aarch64.patch +0 -0
similarity index 100%
rename from meta/recipes-support/liburcu/files/aarch64.patch
rename to meta/recipes-support/liburcu/liburcu/aarch64.patch
meta/recipes-support/liburcu/liburcu_0.8.6.bb renamed from meta/recipes-support/liburcu/liburcu_0.8.5.bb +2 -2
similarity index 83%
rename from meta/recipes-support/liburcu/liburcu_0.8.5.bb
rename to meta/recipes-support/liburcu/liburcu_0.8.6.bb
index 62323d3..263b77e 100644
@@ -12,8 +12,8 @@ SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \
            file://aarch64.patch \
           "
 
-SRC_URI[md5sum] = "24ba9e03542b747d3378434eb0041acf"
-SRC_URI[sha256sum] = "a2562eaca107ec6eca2856632b6035c6aaf38df79020195ed8955a7b4773312a"
+SRC_URI[md5sum] = "834d91d939dd55108a05763be9879856"
+SRC_URI[sha256sum] = "b1a5d3bce014ba7a702759bc60b692c1cd46ff0e8a5b53f0d0a95e22db74ab21"
 
 S = "${WORKDIR}/userspace-rcu-${PV}"
 CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
Signature · 1 line
2.1.0
author
#16 lore raw

PATCH 12/12 libgpg-error: Update to 1.17

In reply to Saul Wold

Rebased the pkgconfig.patch

Added do_compile_prepend() copy an architecture specific header file.

---
 .../pkgconfig.patch                                | 67 ++++++++++++++--------
 .../{libgpg-error_1.12.bb => libgpg-error_1.17.bb} | 35 +++++++++--
 2 files changed, 72 insertions(+), 30 deletions(-)
 rename meta/recipes-support/libgpg-error/{libgpg-error-1.12 => libgpg-error}/pkgconfig.patch (70%)
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.12.bb => libgpg-error_1.17.bb} (40%)
meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch renamed from meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch +42 -25
similarity index 70%
rename from meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch
rename to meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
index 89c9d22..96476ba 100644
@@ -5,11 +5,11 @@
 
 Upstream-Status: Pending
 
-Index: libgpg-error-1.12/configure.ac
+Index: libgpg-error-1.17/configure.ac
 ===================================================================
---- libgpg-error-1.12.orig/configure.ac	2014-05-13 21:14:26.846393236 +0000
-+++ libgpg-error-1.12/configure.ac	2014-05-13 21:14:26.926393236 +0000
-@@ -217,6 +217,7 @@
+--- libgpg-error-1.17.orig/configure.ac
++++ libgpg-error-1.17/configure.ac
+@@ -521,6 +521,7 @@ AC_CONFIG_FILES([src/Makefile tests/Make
  AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpg-error.asd])
  AC_CONFIG_FILES([src/versioninfo.rc])
  AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config])
@@ -17,11 +17,11 @@ Index: libgpg-error-1.12/configure.ac
  
  AC_OUTPUT
  
-Index: libgpg-error-1.12/src/Makefile.am
+Index: libgpg-error-1.17/src/Makefile.am
 ===================================================================
---- libgpg-error-1.12.orig/src/Makefile.am	2014-05-13 21:14:26.846393236 +0000
-+++ libgpg-error-1.12/src/Makefile.am	2014-05-13 21:14:26.934393236 +0000
-@@ -37,13 +37,15 @@
+--- libgpg-error-1.17.orig/src/Makefile.am
++++ libgpg-error-1.17/src/Makefile.am
+@@ -74,13 +74,15 @@ nodist_include_HEADERS = gpg-error.h
  bin_SCRIPTS = gpg-error-config
  m4datadir = $(datadir)/aclocal
  m4data_DATA = gpg-error.m4
@@ -31,17 +31,17 @@ Index: libgpg-error-1.12/src/Makefile.am
  EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
  	mkerrnos.awk errnos.in README \
  	mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \
- 	mkheader.awk gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \
+ 	mkheader.c gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \
  	err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \
--	gpg-error.def.in versioninfo.rc.in
-+	gpg-error.def.in versioninfo.rc.in gpg-error.pc.in
+-	gpg-error.vers gpg-error.def.in versioninfo.rc.in \
++	gpg-error.vers gpg-error.def.in versioninfo.rc.in gpg-error.pc \
+ 	$(lock_obj_pub)
  
  BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \
- 	err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h \
-Index: libgpg-error-1.12/src/gpg-error.pc.in
+Index: libgpg-error-1.17/src/gpg-error.pc.in
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgpg-error-1.12/src/gpg-error.pc.in	2014-05-13 21:48:20.266382916 +0000
+--- /dev/null
++++ libgpg-error-1.17/src/gpg-error.pc.in
 @@ -0,0 +1,11 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -54,11 +54,11 @@ Index: libgpg-error-1.12/src/gpg-error.pc.in
 +Version: @VERSION@
 +Libs: -L${libdir} -lgpg-error
 +Cflags: -I${includedir}
-Index: libgpg-error-1.12/src/gpg-error.m4
+Index: libgpg-error-1.17/src/gpg-error.m4
 ===================================================================
---- libgpg-error-1.12.orig/src/gpg-error.m4	2014-05-13 21:45:02.038383922 +0000
-+++ libgpg-error-1.12/src/gpg-error.m4	2014-05-13 21:47:08.362383281 +0000
-@@ -15,58 +15,14 @@
+--- libgpg-error-1.17.orig/src/gpg-error.m4
++++ libgpg-error-1.17/src/gpg-error.m4
+@@ -26,73 +26,13 @@ dnl is added to the gpg_config_script_wa
  dnl
  AC_DEFUN([AM_PATH_GPG_ERROR],
  [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -70,7 +70,7 @@ Index: libgpg-error-1.12/src/gpg-error.m4
 -              AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
 -                             [prefix where GPG Error is installed (optional)]),
 -              [gpg_error_config_prefix="$withval"])
- 
+-
 -  dnl Accept --with-gpg-error-prefix and make it work the same as
 -  dnl --with-libgpg-error-prefix above, for backwards compatibility,
 -  dnl but do not document this old, inconsistently-named option.
@@ -78,14 +78,27 @@ Index: libgpg-error-1.12/src/gpg-error.m4
 -              [gpg_error_config_prefix="$withval"])
 +  min_gpg_error_version=ifelse([$1], ,0.0,$1)
  
--  if test x$gpg_error_config_prefix != x ; then
--     if test x${GPG_ERROR_CONFIG+set} != xset ; then
--        GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config
+-  if test x"${GPG_ERROR_CONFIG}" = x ; then
+-     if test x"${gpg_error_config_prefix}" != x ; then
+-        GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
+-     else
+-       case "${SYSROOT}" in
+-         /*)
+-           if test -x "${SYSROOT}/bin/gpg-error-config" ; then
+-             GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
+-           fi
+-           ;;
+-         '')
+-           ;;
+-          *)
+-           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+-           ;;
+-       esac
 -     fi
 -  fi
 +  PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no])
  
--  AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no)
+-  AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
 -  min_gpg_error_version=ifelse([$1], ,0.0,$1)
 -  AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
 -  ok=no
@@ -113,6 +126,8 @@ Index: libgpg-error-1.12/src/gpg-error.m4
    if test $ok = yes; then
 -    GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
 -    GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
+-    GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
+-    GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
 -    AC_MSG_RESULT([yes ($gpg_error_config_version)])
      ifelse([$2], , :, [$2])
 -    gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
@@ -120,12 +135,14 @@ Index: libgpg-error-1.12/src/gpg-error.m4
      if test x"$gpg_error_config_host" != xnone ; then
        if test x"$gpg_error_config_host" != x"$host" ; then
    AC_MSG_WARN([[
-@@ -80,9 +36,6 @@
+@@ -107,11 +47,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
        fi
      fi
    else
 -    GPG_ERROR_CFLAGS=""
 -    GPG_ERROR_LIBS=""
+-    GPG_ERROR_MT_CFLAGS=""
+-    GPG_ERROR_MT_LIBS=""
 -    AC_MSG_RESULT(no)
      ifelse([$3], , :, [$3])
    fi
meta/recipes-support/libgpg-error/libgpg-error_1.17.bb renamed from meta/recipes-support/libgpg-error/libgpg-error_1.12.bb +30 -5
similarity index 40%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.12.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.17.bb
index af9574d..c905bd1 100644
@@ -5,8 +5,8 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
 LICENSE = "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-                    file://src/gpg-error.h.in;endline=23;md5=6ac0378874589a44d53512b3786b4bc0 \
-                    file://src/init.c;endline=20;md5=b69742f2a8827d494c6f6a4b1768416c"
+                    file://src/gpg-error.h.in;endline=23;md5=5dfe776dc8b62af093ddc859de6f494c \
+                    file://src/init.c;endline=20;md5=8f5a9b59634f4aebcd0ec9d3ebd53bfe"
 
 
 SECTION = "libs"
@@ -14,18 +14,43 @@ SECTION = "libs"
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
            file://pkgconfig.patch"
 
-SRC_URI[md5sum] = "8f0eb41a344d19ac2aa9bd101dfb9ce6"
-SRC_URI[sha256sum] = "cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f"
+SRC_URI[md5sum] = "b4f8d8b9ff14aed41f279aa844563539"
+SRC_URI[sha256sum] = "3ff4e5a71116eb862cd14185fcd282850927b8608e3b4186834fd940fbef57b5"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
 inherit autotools binconfig-disabled pkgconfig gettext
 
-FILES_${PN}-dev += "${bindir}/gpg-error"
+do_compile_prepend() {
+	TARGET_FILE=linux-gnu
+	if [ ${TARGET_OS} != "linux" ]; then
+		TARGET_FILE=${TARGET_OS}
+	fi
+
+	case ${TARGET_ARCH} in
+	  aarch64)    TUPLE=aarch64-unknown-linux-gnu ;;
+	  arm)	      TUPLE=arm-unknown-linux-gnueabi ;;
+	  armeb)      TUPLE=arm-unknown-linux-gnueabi ;;
+	  i586)       TUPLE=i486-pc-linux-gnu ;;
+	  mipsel)     TUPLE=mipsel-unknown-linux-gnu ;;
+	  mips64el)   TUPLE=mipsel-unknown-linux-gnu ;;
+	  mips64)     TUPLE=mips-unknown-linux-gnu ;;
+	  mips)       TUPLE=mips-unknown-linux-gnu ;;
+	  powerpc64)  TUPLE=powerpc64-unknown-linux-gnu ;;
+	  powerpc)    TUPLE=powerpc-unknown-linux-gnu ;;
+	  sh4)	      TUPLE=sh4-unknown-linux-gnu ;;
+	  x86_64)     TUPLE=x86_64-pc-linux-gnu ;;
+	esac
+
+	cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \
+	  ${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h
+}
 
 do_install_append() {
 	# we don't have common lisp in OE
 	rm -rf "${D}${datadir}/common-lisp/"
 }
 
+FILES_${PN}-dev += "${bindir}/gpg-error"
+
 BBCLASSEXTEND = "native"
Signature · 1 line
2.1.0
#7 lore raw

Re: [PATCH 05/12] gnu-efi: Upgrade to 3.0w

In reply to Saul Wold
Quoted 10 lines · Saul Wold
meta/recipes-bsp/gnu-efi/gnu-efi_3.0w.bb renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb +1 -0
@@ -8,6 +8,7 @@ SRC_URI = "
 http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0u.orig.tar.gz \
            file://parallel-make.patch \
            file://parallel-make-archives.patch \
           "
+
 SRC_URI[md5sum] = "d15d3c700e79a1e2938544d73edc572d"
 SRC_URI[sha256sum] =
Quoted 2 lines

"3c0d450d5829204ca05dcb3b2aae772e52c379b7c7e09146759c6315606f934e"

No change to the checksums, presumably they didn't brute-force a sha256sum attack to do that. ;)

Ross

author
#8 lore raw

Re: [PATCH 05/12] gnu-efi: Upgrade to 3.0w

Quoted 18 lines · Ross
Quoted 10 lines · Saul Wold
meta/recipes-bsp/gnu-efi/gnu-efi_3.0w.bb renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0u.bb +1 -0
@@ -8,6 +8,7 @@ SRC_URI = "
 http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0u.orig.tar.gz \
             file://parallel-make.patch \
             file://parallel-make-archives.patch \
            "
+
  SRC_URI[md5sum] = "d15d3c700e79a1e2938544d73edc572d"
  SRC_URI[sha256sum] =
Quoted 2 lines

"3c0d450d5829204ca05dcb3b2aae772e52c379b7c7e09146759c6315606f934e"

No change to the checksums, presumably they didn't brute-force a sha256sum attack to do that. ;)

Looking at this, it would probably have helped if I actually updated the tarball, Sorry for the noise with this gnu-efi non-update!

Sau!

Quoted 2 lines

Ross

#2 lore raw

Re: [PATCH 01/12] usbutils: Add version 008

In reply to Saul Wold

meta/recipes-bsp/usbutils/usbutils_008.bb line 34

Quoted 4 lines · Saul Wold
meta/recipes-bsp/usbutils/usbutils_008.bb new file +3 -0
+FILES_${PN}-ids = "${datadir}/usb*"
+
+RDEPENDS_${PN} = "${PN}-ids libudev"

The IDs are part of udev 196's hwdb, so usbutils-ids doesn't get created and this runtime dependency isn't satisfiable.

Ross

#10 lore raw

Re: [PATCH 06/12] json-c: Upgrade to 0.12

In reply to Saul Wold
Quoted 16 lines · Saul Wold

Added CFLAGS to prevent compiler error of unused size variable

---
 meta/recipes-devtools/json-c/{json-c_0.11.bb => json-c_0.12.bb} | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/json-c/{json-c_0.11.bb => json-c_0.12.bb} (75%)
meta/recipes-devtools/json-c/json-c_0.12.bb renamed from meta/recipes-devtools/json-c/json-c_0.11.bb +0 -0
similarity index 75%
rename from meta/recipes-devtools/json-c/json-c_0.11.bb
rename to meta/recipes-devtools/json-c/json-c_0.12.bb
index 389e0f9..79cf6dc 100644

meta/recipes-devtools/json-c/json-c_0.12.bb LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2" · line 12

Quoted 9 lines
meta/recipes-devtools/json-c/json-c_0.12.bb renamed from meta/recipes-devtools/json-c/json-c_0.11.bb +2 -2
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2"
 
 SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "aa02367d2f7a830bf1e3376f77881e98"
-SRC_URI[sha256sum] = "28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c"
+SRC_URI[md5sum] = "3ca4bbb881dfc4017e8021b5e0a8c491"
+SRC_URI[sha256sum] = "000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f"
 
 RPROVIDES_${PN} = "libjson"

^ This isn't correct anymore (isn't compatible with libjson).

0.12 doesn't install libjson shim (json.pc) anymore and libjson libs are gone as well:

See:
https://github.com/json-c/json-c/commit/c8ee9196420c4b7c295a38c397a4e315df1baa03

as results it breaks couple recipes in world builds:
/home/jenkins/oe/world/shr-core/meta-webos-ports/meta-luneui/recipes-webos/luna-sysmgr-common/luna-sysmgr-common.bb, do_compile /home/jenkins/oe/world/shr-core/meta-smartphone/meta-android/recipes-android/suspend-blocker/suspend-blocker.bb, do_compile /home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb, do_compile
and a lot more which depend on luna-sysmgr-common so they aren't shown.

OE qemux86@luneos ~/webos/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/json-c $ ls -lR 0.1*/image/usr/lib/ 0.11-r0/image/usr/lib/:
total 240

-rw-r--r-- 2 bitbake bitbake 121584 Jan  9 10:48 libjson-c.a
-rwxr-xr-x 2 bitbake bitbake    925 Jan  9 10:48 libjson-c.la
lrwxrwxrwx 1 bitbake bitbake     18 Jan  9 10:48 libjson-c.so -> libjson-c.so.2.0.1
lrwxrwxrwx 1 bitbake bitbake     18 Jan  9 10:48 libjson-c.so.2 -> libjson-c.so.2.0.1
-rwxr-xr-x 2 bitbake bitbake  95836 Jan  9 10:48 libjson-c.so.2.0.1
-rw-r--r-- 2 bitbake bitbake   1780 Jan  9 10:48 libjson.a
-rwxr-xr-x 2 bitbake bitbake    934 Jan  9 10:48 libjson.la
lrwxrwxrwx 1 bitbake bitbake     16 Jan  9 10:48 libjson.so -> libjson.so.0.1.0
lrwxrwxrwx 1 bitbake bitbake     16 Jan  9 10:48 libjson.so.0 -> libjson.so.0.1.0
-rwxr-xr-x 2 bitbake bitbake   5752 Jan  9 10:48 libjson.so.0.1.0
drwxr-xr-x 2 bitbake bitbake   4096 Jan  9 10:48 pkgconfig

0.11-r0/image/usr/lib/pkgconfig:
total 8
-rw-r--r-- 2 bitbake bitbake 205 Jan 9 10:48 json-c.pc -rw-r--r-- 2 bitbake bitbake 201 Jan 9 10:48 json.pc

0.12-r0/image/usr/lib/:
total 252

-rw-r--r-- 3 bitbake bitbake 138592 Jan  9 12:04 libjson-c.a
-rwxr-xr-x 3 bitbake bitbake    925 Jan  9 12:04 libjson-c.la
lrwxrwxrwx 1 bitbake bitbake     18 Jan  9 12:04 libjson-c.so -> libjson-c.so.2.0.1
lrwxrwxrwx 1 bitbake bitbake     18 Jan  9 12:04 libjson-c.so.2 -> libjson-c.so.2.0.1
-rwxr-xr-x 3 bitbake bitbake 108728 Jan  9 12:04 libjson-c.so.2.0.1
drwxr-xr-x 2 bitbake bitbake   4096 Jan  9 12:04 pkgconfig

0.12-r0/image/usr/lib/pkgconfig:
total 4
-rw-r--r-- 3 bitbake bitbake 205 Jan 9 12:04 json-c.pc

Quoted 14 lines
meta/recipes-devtools/json-c/json-c_0.12.bb renamed from meta/recipes-devtools/json-c/json-c_0.11.bb +2 -0
@@ -19,3 +19,5 @@ do_configure_prepend() {
     # Clean up autoconf cruft that should not be in the tarball
     rm -f ${S}/config.status
 }
+
+CFLAGS += "-Wno-error=unused-but-set-variable"
Signature · 7 lines
2.1.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]