[OE-core] [PATCH] libyui
Add a new recipe libyui. Signed-off-by: Zheng Ruoqin--- meta/recipes-graphics/libyui/libyui_git.bb | 36 ++ 1 file changed, 36 insertions(+) create mode 100644 meta/recipes-graphics/libyui/libyui_git.bb diff --git a/meta/recipes-graphics/libyui/libyui_git.bb b/meta/recipes-graphics/libyui/libyui_git.bb new file mode 100644 index 000..3edb0c6 --- /dev/null +++ b/meta/recipes-graphics/libyui/libyui_git.bb @@ -0,0 +1,36 @@ +SUMMARY = "Libyui is a widget abstraction library providing Qt, GTK and ncurses frontends." +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ +file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + " + +SRC_URI = "git://github.com/libyui/libyui.git \ + " + +PV = "3.3.3+git" +SRCREV = "f4ccea39f6b6f37eabd0a4df49db5f9bcb3c013a" + +S = "${WORKDIR}/git" + +inherit cmake gettext pkgconfig + +DEPENDS += "boost" + +BBCLASSEXTEND = "nativesdk" + +RDEPENDS_${PN} += "boost" + +do_configure_prepend () { +cp ${S}/buildtools/CMakeLists.common ${S}/CMakeLists.txt +} + +do_install_append () { +rm -rf ${D}${datadir}/libyui +if [ ${libdir} = "/usr/lib" ]; then +mv ${D}/usr/lib64 ${D}/usr/lib +fi +} + +FILES_${PN}-dev = "${libdir}/* ${includedir}/yui*" + -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python-setuptools: update to 36.7.2
1) Upgrade python-setuptools from 36.5.0 to 36.7.2. Signed-off-by: Zheng Ruoqin--- meta/recipes-devtools/python/python-setuptools.inc| 4 ++-- .../{python-setuptools_36.5.0.bb => python-setuptools_36.7.2.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/python/{python-setuptools_36.5.0.bb => python-setuptools_36.7.2.bb} (100%) diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index 1eae0b6..56b17ad 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -9,8 +9,8 @@ SRCNAME = "setuptools" SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.zip; -SRC_URI[md5sum] = "704f500dd55f4bd0be905444f3ba892c" -SRC_URI[sha256sum] = "ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64" +SRC_URI[md5sum] = "1874983171af0f7b16b5ec48558e6e55" +SRC_URI[sha256sum] = "ad86fd8dd09c285c33b4c5b82bbc21d21883637faef78b0ab58fa9984847220d" UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools; diff --git a/meta/recipes-devtools/python/python-setuptools_36.5.0.bb b/meta/recipes-devtools/python/python-setuptools_36.7.2.bb similarity index 100% rename from meta/recipes-devtools/python/python-setuptools_36.5.0.bb rename to meta/recipes-devtools/python/python-setuptools_36.7.2.bb -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kexec-tools: 2.0.14 -> 2.0.15
1) Upgrade kexec-tools from 2.0.14 to 2.0.15. 2) Remove patches that are included in 2.0.15. kexec-tools/0001-arm64-Disable-PIC.patch kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch kexec-tools/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch kexec-tools/0001-x86-x86_64-Fix-format-warning-with-die.patch kexec-tools/0002-kexec-generalize-and-rename-get_kernel_stext_sym.patch kexec-tools/0002-ppc-Fix-format-warning-with-die.patch kexec-tools/0003-arm64-identify-PHYS_OFFSET-correctly.patch kexec-tools/0004-arm64-kdump-identify-memory-regions.patch kexec-tools/0005-arm64-kdump-add-elf-core-header-segment.patch kexec-tools/0006-arm64-kdump-set-up-kernel-image-segment.patch kexec-tools/0007-arm64-kdump-set-up-other-segments.patch kexec-tools/0008-arm64-kdump-add-DT-properties-to-crash-dump-kernel-s.patch kexec-tools/0009-arm64-kdump-Add-support-for-binary-image-files.patch Signed-off-by: Zheng Ruoqin--- .../kexec/kexec-tools/0001-arm64-Disable-PIC.patch | 31 ...nd-the-semantics-of-kexec_iomem_for_each_.patch | 78 .../0001-vmcore-dmesg-Define-_GNU_SOURCE.patch | 31 ...01-x86-x86_64-Fix-format-warning-with-die.patch | 78 ...eneralize-and-rename-get_kernel_stext_sym.patch | 194 .../0002-ppc-Fix-format-warning-with-die.patch | 43 - ...0003-arm64-identify-PHYS_OFFSET-correctly.patch | 76 .../0004-arm64-kdump-identify-memory-regions.patch | 202 - ...5-arm64-kdump-add-elf-core-header-segment.patch | 191 --- ...6-arm64-kdump-set-up-kernel-image-segment.patch | 137 -- .../0007-arm64-kdump-set-up-other-segments.patch | 35 ...-add-DT-properties-to-crash-dump-kernel-s.patch | 150 --- ...-kdump-Add-support-for-binary-image-files.patch | 52 -- ...kexec-tools_2.0.14.bb => kexec-tools_2.0.15.bb} | 17 +- 14 files changed, 2 insertions(+), 1313 deletions(-) delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-x86-x86_64-Fix-format-warning-with-die.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0002-kexec-generalize-and-rename-get_kernel_stext_sym.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0002-ppc-Fix-format-warning-with-die.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0003-arm64-identify-PHYS_OFFSET-correctly.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0004-arm64-kdump-identify-memory-regions.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0005-arm64-kdump-add-elf-core-header-segment.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0006-arm64-kdump-set-up-kernel-image-segment.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0008-arm64-kdump-add-DT-properties-to-crash-dump-kernel-s.patch delete mode 100644 meta/recipes-kernel/kexec/kexec-tools/0009-arm64-kdump-Add-support-for-binary-image-files.patch rename meta/recipes-kernel/kexec/{kexec-tools_2.0.14.bb => kexec-tools_2.0.15.bb} (63%) diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch deleted file mode 100644 index 84e94d7..000 --- a/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3bb73e5e5649b455e15d5ca3a7ad1a90c4960972 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 10 Jun 2017 11:54:36 -0700 -Subject: [PATCH] arm64: Disable PIC - -Fix -| cc1: sorry, unimplemented: code model 'large' with -fPIC -| make: *** [Makefile:118: purgatory/arch/arm64/entry.o] Error 1 - -Signed-off-by: Khem Raj -Upstream-Status: Pending - - purgatory/arch/arm64/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/purgatory/arch/arm64/Makefile b/purgatory/arch/arm64/Makefile -index 636abea..80068ca 100644 a/purgatory/arch/arm64/Makefile -+++ b/purgatory/arch/arm64/Makefile -@@ -1,6 +1,7 @@ - - arm64_PURGATORY_EXTRA_CFLAGS = \ - -mcmodel=large \ -+ -fno-PIC \ - -fno-stack-protector \ - -fno-asynchronous-unwind-tables \ - -Wundef \ --- -2.13.1 - diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch deleted file mode 100644 index 822f28c..000 ---
[OE-core] [PATCH v3] glibc-package.inc: add support for armeb of multilib
Add support for armeb of multilib. Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- meta/recipes-core/glibc/glibc-package.inc | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 0281251..1a19d4f 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -131,6 +131,10 @@ do_install_append_arm () { do_install_armmultilib } +do_install_append_armeb () { + do_install_armmultilib +} + do_install_armmultilib () { oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] glibc-package.inc: add support for armeb of multilib
Add support for armeb of multilib. Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- meta/recipes-core/glibc/glibc-package.inc | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 0281251..1a19d4f 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -131,6 +131,10 @@ do_install_append_arm () { do_install_armmultilib } +do_install_append_armb () { + do_install_armmultilib +} + do_install_armmultilib () { oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glibc-package.inc: add support for armeb of multilib
add support for armeb of multilib Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- meta/recipes-core/glibc/glibc-package.inc | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 0281251..a6e7cfa 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -131,6 +131,10 @@ do_install_append_arm () { do_install_armmultilib } +do_install_append_armb () { +do_install_armmultilib +} + do_install_armmultilib () { oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] (morty) rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi bash-4.3.30-r0.src.rpm warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e: NOKEY Name: bash Version : 4.3.30 Release : r0 Architecture: i586 Install Date: (not installed) Group : ?? Size: 8413797 License : GPLv3+ Signature : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e Source RPM : (none) Build Date : Wed 21 Jun 2017 07:37:52 PM PDT Build Host : ubuntu Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://tiswww.case.edu/php/chet/bash/bashtop.html Summary : 8 Description : 8 Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 48 ++ meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..b962617 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,48 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Pending +$ rpm -qpi bash-4.3.30-r0.src.rpm +warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e: NOKEY +Name: bash +Version : 4.3.30 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ?? +Size: 8413797 +License : GPLv3+ +Signature : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e +Source RPM : (none) +Build Date : Wed 21 Jun 2017 07:37:52 PM PDT +Build Host : ubuntu +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://tiswww.case.edu/php/chet/bash/bashtop.html +Summary : 8 +Description : +8 + +Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/tagname.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..dbcafd1 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + void tagTypeValidate(HE_t he); + void tagTypeValidate(HE_t he) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ ++/* XXX RPM_I18NSTRING_TYPE is treated as strings. */ + if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; ++ return; + + /* XXX Arbitrary tags are always strings. */ + if ((he->tag & 0x4000) +-- +2.7.4 + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index 497af8e..ae5e0c4 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb @@ -120,6 +120,7 @@ SRC_URI += " \ file://0001-system.h-query.c-support-nosignature.patch \ file://rpm-ensure-rpm2cpio-call-rpm-relocation-code.patch \ file://0001-macros-add-_gpg_sign_cmd_extra_args.patch \ + file://0001-Fix-the-Bug-of-SRPM-String-error.patch \ " # OE specific changes -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] (krogoth) rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi bash-4.3.30-r0.src.rpm warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e: NOKEY Name: bash Version : 4.3.30 Release : r0 Architecture: i586 Install Date: (not installed) Group : ?? Size: 8413797 License : GPLv3+ Signature : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e Source RPM : (none) Build Date : Wed 21 Jun 2017 07:37:52 PM PDT Build Host : ubuntu Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://tiswww.case.edu/php/chet/bash/bashtop.html Summary : 8 Description : 8 Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 48 ++ meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..b962617 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,48 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Pending +$ rpm -qpi bash-4.3.30-r0.src.rpm +warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e: NOKEY +Name: bash +Version : 4.3.30 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ?? +Size: 8413797 +License : GPLv3+ +Signature : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e +Source RPM : (none) +Build Date : Wed 21 Jun 2017 07:37:52 PM PDT +Build Host : ubuntu +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://tiswww.case.edu/php/chet/bash/bashtop.html +Summary : 8 +Description : +8 + +Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/tagname.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..dbcafd1 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + void tagTypeValidate(HE_t he); + void tagTypeValidate(HE_t he) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ ++/* XXX RPM_I18NSTRING_TYPE is treated as strings. */ + if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; ++ return; + + /* XXX Arbitrary tags are always strings. */ + if ((he->tag & 0x4000) +-- +2.7.4 + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index eb2d4f9..1c4699e 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb @@ -119,6 +119,7 @@ SRC_URI += " \ file://gcc6-stdlib.patch \ file://0001-system.h-query.c-support-nosignature.patch \ file://rpm-ensure-rpm2cpio-call-rpm-relocation-code.patch \ + file://0001-Fix-the-Bug-of-SRPM-String-error.patch \ " # OE specific changes -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] (jethro) rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi bash-4.3.30-r0.src.rpm warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e: NOKEY Name: bash Version : 4.3.30 Release : r0 Architecture: i586 Install Date: (not installed) Group : ?? Size: 8413797 License : GPLv3+ Signature : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e Source RPM : (none) Build Date : Wed 21 Jun 2017 07:37:52 PM PDT Build Host : ubuntu Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://tiswww.case.edu/php/chet/bash/bashtop.html Summary : 8 Description : 8 Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 48 ++ meta/recipes-devtools/rpm/rpm_5.4.14.bb| 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..b962617 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,48 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Pending +$ rpm -qpi bash-4.3.30-r0.src.rpm +warning: bash-4.3.30-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID 0a868e8e: NOKEY +Name: bash +Version : 4.3.30 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ?? +Size: 8413797 +License : GPLv3+ +Signature : DSA/SHA1, Wed 21 Jun 2017 07:37:52 PM PDT, Key ID 609104e40a868e8e +Source RPM : (none) +Build Date : Wed 21 Jun 2017 07:37:52 PM PDT +Build Host : ubuntu +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://tiswww.case.edu/php/chet/bash/bashtop.html +Summary : 8 +Description : +8 + +Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/tagname.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..dbcafd1 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + void tagTypeValidate(HE_t he); + void tagTypeValidate(HE_t he) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ ++/* XXX RPM_I18NSTRING_TYPE is treated as strings. */ + if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; ++ return; + + /* XXX Arbitrary tags are always strings. */ + if ((he->tag & 0x4000) +-- +2.7.4 + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index 73b3734..f8bdfe9 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -100,6 +100,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-macros.in-disable-external-key-server.patch \ file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ file://configure.ac-check-for-both-gpg2-and-gpg.patch \ + file://0001-Fix-the-Bug-of-SRPM-String-error.patch \ " # Uncomment the following line to enable platform score debugging -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] (morty) rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ??? Size: 633007 License : Zlib Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017???04???22??? 00???38???03??? Build Host : force Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://zlib.net/ Summary : Description : ??? Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 48 ++ meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..b962617 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,48 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Pending +$ rpm -qpi zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ??? +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017???04???22??? 00???38???03??? +Build Host : force +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://zlib.net/ +Summary : +Description : +??? + +Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/tagname.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..dbcafd1 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + void tagTypeValidate(HE_t he); + void tagTypeValidate(HE_t he) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ ++/* XXX RPM_I18NSTRING_TYPE is treated as strings. */ + if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; ++ return; + + /* XXX Arbitrary tags are always strings. */ + if ((he->tag & 0x4000) +-- +2.7.4 + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index 497af8e..ae5e0c4 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb @@ -120,6 +120,7 @@ SRC_URI += " \ file://0001-system.h-query.c-support-nosignature.patch \ file://rpm-ensure-rpm2cpio-call-rpm-relocation-code.patch \ file://0001-macros-add-_gpg_sign_cmd_extra_args.patch \ + file://0001-Fix-the-Bug-of-SRPM-String-error.patch \ " # OE specific changes -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] (krogoth) rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ??? Size: 633007 License : Zlib Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017???04???22??? 00???38???03??? Build Host : force Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://zlib.net/ Summary : Description : ??? Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 48 ++ meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..b962617 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,48 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Pending +$ rpm -qpi zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ??? +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017???04???22??? 00???38???03??? +Build Host : force +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://zlib.net/ +Summary : +Description : +??? + +Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/tagname.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..dbcafd1 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + void tagTypeValidate(HE_t he); + void tagTypeValidate(HE_t he) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ ++/* XXX RPM_I18NSTRING_TYPE is treated as strings. */ + if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; ++ return; + + /* XXX Arbitrary tags are always strings. */ + if ((he->tag & 0x4000) +-- +2.7.4 + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index eb2d4f9..1c4699e 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb @@ -119,6 +119,7 @@ SRC_URI += " \ file://gcc6-stdlib.patch \ file://0001-system.h-query.c-support-nosignature.patch \ file://rpm-ensure-rpm2cpio-call-rpm-relocation-code.patch \ + file://0001-Fix-the-Bug-of-SRPM-String-error.patch \ " # OE specific changes -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] (jethro) rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ??? Size: 633007 License : Zlib Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017???04???22??? 00???38???03??? Build Host : force Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://zlib.net/ Summary : Description : ??? Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 48 ++ meta/recipes-devtools/rpm/rpm_5.4.14.bb| 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..b962617 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,48 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Pending +$ rpm -qpi zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ??? +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017???04???22??? 00???38???03??? +Build Host : force +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://zlib.net/ +Summary : +Description : +??? + +Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/tagname.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..dbcafd1 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + void tagTypeValidate(HE_t he); + void tagTypeValidate(HE_t he) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ ++/* XXX RPM_I18NSTRING_TYPE is treated as strings. */ + if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; ++ return; + + /* XXX Arbitrary tags are always strings. */ + if ((he->tag & 0x4000) +-- +2.7.4 + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index 73b3734..f8bdfe9 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -100,6 +100,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-macros.in-disable-external-key-server.patch \ file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ file://configure.ac-check-for-both-gpg2-and-gpg.patch \ + file://0001-Fix-the-Bug-of-SRPM-String-error.patch \ " # Uncomment the following line to enable platform score debugging -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] [morty] rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ??? Size: 633007 License : Zlib Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017???04???22??? 00???38???03??? Build Host : force Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://zlib.net/ Summary : Description : ??? Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 48 ++ meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..b962617 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,48 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Pending +$ rpm -qpi zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ??? +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017???04???22??? 00???38???03??? +Build Host : force +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://zlib.net/ +Summary : +Description : +??? + +Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/tagname.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..dbcafd1 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + void tagTypeValidate(HE_t he); + void tagTypeValidate(HE_t he) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ ++/* XXX RPM_I18NSTRING_TYPE is treated as strings. */ + if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; ++ return; + + /* XXX Arbitrary tags are always strings. */ + if ((he->tag & 0x4000) +-- +2.7.4 + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index 497af8e..ae5e0c4 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb @@ -120,6 +120,7 @@ SRC_URI += " \ file://0001-system.h-query.c-support-nosignature.patch \ file://rpm-ensure-rpm2cpio-call-rpm-relocation-code.patch \ file://0001-macros-add-_gpg_sign_cmd_extra_args.patch \ + file://0001-Fix-the-Bug-of-SRPM-String-error.patch \ " # OE specific changes -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] [krogoth] rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ??? Size: 633007 License : Zlib Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017???04???22??? 00???38???03??? Build Host : force Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://zlib.net/ Summary : Description : ??? Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 48 ++ meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..b962617 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,48 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Pending +$ rpm -qpi zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ??? +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017???04???22??? 00???38???03??? +Build Host : force +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://zlib.net/ +Summary : +Description : +??? + +Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/tagname.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..dbcafd1 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + void tagTypeValidate(HE_t he); + void tagTypeValidate(HE_t he) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ ++/* XXX RPM_I18NSTRING_TYPE is treated as strings. */ + if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; ++ return; + + /* XXX Arbitrary tags are always strings. */ + if ((he->tag & 0x4000) +-- +2.7.4 + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index eb2d4f9..1c4699e 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb @@ -119,6 +119,7 @@ SRC_URI += " \ file://gcc6-stdlib.patch \ file://0001-system.h-query.c-support-nosignature.patch \ file://rpm-ensure-rpm2cpio-call-rpm-relocation-code.patch \ + file://0001-Fix-the-Bug-of-SRPM-String-error.patch \ " # OE specific changes -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] [jethro] rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ??? Size: 633007 License : Zlib Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017???04???22??? 00???38???03??? Build Host : force Relocations : (not relocatable) Packager: Poky <p...@yoctoproject.org> URL : http://zlib.net/ Summary : Description : ??? Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 48 ++ meta/recipes-devtools/rpm/rpm_5.4.14.bb| 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..b962617 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,48 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Pending +$ rpm -qpi zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ??? +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017???04???22??? 00???38???03??? +Build Host : force +Relocations : (not relocatable) +Packager: Poky <p...@yoctoproject.org> +URL : http://zlib.net/ +Summary : +Description : +??? + +Signed-off-by: zhengrq <zhengrq.f...@cn.fujitsu.com> +--- + rpmdb/tagname.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..dbcafd1 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -518,9 +518,9 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + void tagTypeValidate(HE_t he); + void tagTypeValidate(HE_t he) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ ++/* XXX RPM_I18NSTRING_TYPE is treated as strings. */ + if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; ++ return; + + /* XXX Arbitrary tags are always strings. */ + if ((he->tag & 0x4000) +-- +2.7.4 + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index 73b3734..f8bdfe9 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -100,6 +100,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-macros.in-disable-external-key-server.patch \ file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ file://configure.ac-check-for-both-gpg2-and-gpg.patch \ + file://0001-Fix-the-Bug-of-SRPM-String-error.patch \ " # Uncomment the following line to enable platform score debugging -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/2] libx11: 1.6.4 -> 1.6.5
Upgrade libx11 from 1.6.4 to 1.6.5 Signed-off-by: Zheng Ruoqin--- meta/recipes-graphics/xorg-lib/{libx11_1.6.4.bb => libx11_1.6.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libx11_1.6.4.bb => libx11_1.6.5.bb} (47%) diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb similarity index 47% rename from meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb rename to meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb index caa95fb..71cbf67 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb @@ -6,5 +6,5 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI += "file://disable_tests.patch \ " -SRC_URI[md5sum] = "6d54227082f3aa2c596f0b3a3fbb9175" -SRC_URI[sha256sum] = "b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441" +SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" +SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/2] libx11-diet: 1.6.4 -> 1.6.5
Upgrade libx11-diet from 1.6.4 to 1.6.5 Signed-off-by: Zheng Ruoqin--- .../xorg-lib/{libx11-diet_1.6.4.bb => libx11-diet_1.6.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.6.4.bb => libx11-diet_1.6.5.bb} (73%) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb similarity index 73% rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.4.bb rename to meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb index 0c761d7..295f96a2 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb @@ -11,8 +11,8 @@ SRC_URI += "file://X18NCMSstubs.diff \ RPROVIDES_${PN}-dev = "libx11-dev" RPROVIDES_${PN}-locale = "libx11-locale" -SRC_URI[md5sum] = "6d54227082f3aa2c596f0b3a3fbb9175" -SRC_URI[sha256sum] = "b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441" +SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" +SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" EXTRA_OECONF += "--disable-xlocale" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 0/2] upgrade libx11 and libx11-diet
1)Upgrade libx11 from 1.6.4 to 1.6.5 2)Upgrade libx11-diet from 1.6.4 to 1.6.5 .../xorg-lib/{libx11-diet_1.6.4.bb => libx11-diet_1.6.5.bb} | 4 ++-- meta/recipes-graphics/xorg-lib/{libx11_1.6.4.bb => libx11_1.6.5.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.6.4.bb => libx11-diet_1.6.5.bb} (73%) rename meta/recipes-graphics/xorg-lib/{libx11_1.6.4.bb => libx11_1.6.5.bb} (47%) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/2] libx11-diet: 1.6.4 -> 1.6.5
Upgrade libx11-diet from 1.6.4 to 1.6.5 Signed-off-by: Zheng Ruoqin--- .../xorg-lib/{libx11-diet_1.6.4.bb => libx11-diet_1.6.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.6.4.bb => libx11-diet_1.6.5.bb} (73%) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb similarity index 73% rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.4.bb rename to meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb index 0c761d7..295f96a2 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb @@ -11,8 +11,8 @@ SRC_URI += "file://X18NCMSstubs.diff \ RPROVIDES_${PN}-dev = "libx11-dev" RPROVIDES_${PN}-locale = "libx11-locale" -SRC_URI[md5sum] = "6d54227082f3aa2c596f0b3a3fbb9175" -SRC_URI[sha256sum] = "b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441" +SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" +SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" EXTRA_OECONF += "--disable-xlocale" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/2] libx11: 1.6.4 -> 1.6.5
Upgrade libx11 from 1.6.4 to 1.6.5 Signed-off-by: Zheng Ruoqin--- meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb | 10 -- meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb | 10 ++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb deleted file mode 100644 index caa95fb..000 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require libx11.inc -inherit gettext - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += "file://disable_tests.patch \ - " - -SRC_URI[md5sum] = "6d54227082f3aa2c596f0b3a3fbb9175" -SRC_URI[sha256sum] = "b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb new file mode 100644 index 000..71cbf67 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb @@ -0,0 +1,10 @@ +require libx11.inc +inherit gettext + +BBCLASSEXTEND = "native nativesdk" + " + +SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" +SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libx11: 1.6.4 -> 1.6.5
Upgrade libx11 from 1.6.4 to 1.6.5 --- meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb | 10 -- meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb | 10 ++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb deleted file mode 100644 index caa95fb..000 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require libx11.inc -inherit gettext - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += "file://disable_tests.patch \ - " - -SRC_URI[md5sum] = "6d54227082f3aa2c596f0b3a3fbb9175" -SRC_URI[sha256sum] = "b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb new file mode 100644 index 000..71cbf67 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb @@ -0,0 +1,10 @@ +require libx11.inc +inherit gettext + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += "file://disable_tests.patch \ + " + +SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" +SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dtc: 1.4.2 -> 1.4.4
Upgrade dtc from 1.4.2 to 1.4.4. Signed-off-by: Zheng Ruoqin--- meta/recipes-kernel/dtc/{dtc_1.4.2.bb => dtc_1.4.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/dtc/{dtc_1.4.2.bb => dtc_1.4.4.bb} (81%) diff --git a/meta/recipes-kernel/dtc/dtc_1.4.2.bb b/meta/recipes-kernel/dtc/dtc_1.4.4.bb similarity index 81% rename from meta/recipes-kernel/dtc/dtc_1.4.2.bb rename to meta/recipes-kernel/dtc/dtc_1.4.4.bb index cc72adc..eadb7ba 100644 --- a/meta/recipes-kernel/dtc/dtc_1.4.2.bb +++ b/meta/recipes-kernel/dtc/dtc_1.4.4.bb @@ -3,7 +3,7 @@ require dtc.inc LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c" -SRCREV = "ec02b34c05be04f249ffaaca4b666f5246877dea" +SRCREV = "558cd81bdd432769b59bff01240c44f82cfb1a9d" S = "${WORKDIR}/git" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libunwind: 1.1 -> 1.2
Upgrade libunwind from 1.1 to 1.2. Signed-off-by: Zheng Ruoqin--- meta/recipes-support/libunwind/libunwind_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libunwind/libunwind_git.bb b/meta/recipes-support/libunwind/libunwind_git.bb index b637c5c..2c00f80 100644 --- a/meta/recipes-support/libunwind/libunwind_git.bb +++ b/meta/recipes-support/libunwind/libunwind_git.bb @@ -1,8 +1,8 @@ require libunwind.inc -PV = "1.1+git${SRCPV}" +PV = "1.2+git${SRCPV}" -SRCREV = "bc8698fd7ed13a629a8ec3cb2a89bd74f9d8b5c0" +SRCREV = "0326f1048a0d75ea9498360f60a0c711cd190b7b" SRC_URI = "git://git.sv.gnu.org/libunwind.git \ file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [morty] [PATCH] rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ??? Size: 633007 License : Zlib Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017???04???22??? 00???38???03??? Build Host : force Relocations : (not relocatable) Packager: PokyURL : http://zlib.net/ Summary : Description : ??? Signed-off-by: Zheng Ruoqin --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 162 + meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 + 2 files changed, 163 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..85c48ac --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,162 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Backport from rpm 5.4.16 +$ rpm -qpi zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ??? +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017???04???22??? 00???38???03??? +Build Host : force +Relocations : (not relocatable) +Packager: Poky +URL : http://zlib.net/ +Summary : +Description : +??? + +Signed-off-by: Zheng Ruoqin +--- + rpmdb/header.c | 8 + rpmdb/rpmtag.h | 1 + + rpmdb/tagname.c | 61 - + 3 files changed, 48 insertions(+), 22 deletions(-) + +diff --git a/rpmdb/header.c b/rpmdb/header.c +index 5d6c6cf..5a80df0 100644 +--- a/rpmdb/header.c b/rpmdb/header.c +@@ -32,7 +32,7 @@ GENfree(HeaderIterator) + #endif/* __cplusplus */ + + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) +-extern void tagTypeValidate(HE_t he) ++extern void tagTypeValidate(HE_t he, unsigned int flags) + /*@*/; + #endif + +@@ -2281,7 +2281,7 @@ int headerGet(Header h, HE_t he, unsigned int flags) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ + if (rc) +- tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2304,7 +2304,7 @@ int headerPut(Header h, HE_t he, /*@unused@*/ unsigned int flags) + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2329,7 +2329,7 @@ int headerMod(Header h, HE_t he, /*@unused@*/ unsigned int flags) + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +diff --git a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h +index ffce678..8f6a2bf 100644 +--- a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h +@@ -868,6 +868,7 @@ int headerGet(Header h, HE_t he, unsigned int flags) + /*@modifies he, internalState @*/; + #define HEADERGET_NOEXTENSION (1 << 0) /*!< Extension search disabler. */ + #define HEADERGET_NOI18NSTRING (1 << 1) /*!< Return i18n strings as argv. */ ++#define HEADERGET_SIGHEADER (1 << 2) /*!< Override signature tag data. */ + + /** \ingroup header + * Add or append tag container to header. +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..374ad77 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -515,28 +515,53 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + * Validate that implicit and explicit types are identical. + * @param he tag container + */ +-void tagTypeValidate(HE_t he); +-void tagTypeValidate(HE_t he) ++void tagTypeValidate(HE_t he, unsigned int flags); ++void tagTypeValidate(HE_t he, unsigned int flags) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ +-if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; +- +-/* XXX Arbitrary tags are always strings. */ +-if ((he->tag & 0x4000) +- && (he->t ==
[OE-core] [krogoth] [PATCH] rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ??? Size: 633007 License : Zlib Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017???04???22??? 00???38???03??? Build Host : force Relocations : (not relocatable) Packager: PokyURL : http://zlib.net/ Summary : Description : ??? Signed-off-by: Zheng Ruoqin --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 162 + meta/recipes-devtools/rpm/rpm_5.4.16.bb| 1 + 2 files changed, 163 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..85c48ac --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,162 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Backport from rpm 5.4.16 +$ rpm -qpi zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ??? +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017???04???22??? 00???38???03??? +Build Host : force +Relocations : (not relocatable) +Packager: Poky +URL : http://zlib.net/ +Summary : +Description : +??? + +Signed-off-by: Zheng Ruoqin +--- + rpmdb/header.c | 8 + rpmdb/rpmtag.h | 1 + + rpmdb/tagname.c | 61 - + 3 files changed, 48 insertions(+), 22 deletions(-) + +diff --git a/rpmdb/header.c b/rpmdb/header.c +index 5d6c6cf..5a80df0 100644 +--- a/rpmdb/header.c b/rpmdb/header.c +@@ -32,7 +32,7 @@ GENfree(HeaderIterator) + #endif/* __cplusplus */ + + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) +-extern void tagTypeValidate(HE_t he) ++extern void tagTypeValidate(HE_t he, unsigned int flags) + /*@*/; + #endif + +@@ -2281,7 +2281,7 @@ int headerGet(Header h, HE_t he, unsigned int flags) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ + if (rc) +- tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2304,7 +2304,7 @@ int headerPut(Header h, HE_t he, /*@unused@*/ unsigned int flags) + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2329,7 +2329,7 @@ int headerMod(Header h, HE_t he, /*@unused@*/ unsigned int flags) + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +diff --git a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h +index ffce678..8f6a2bf 100644 +--- a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h +@@ -868,6 +868,7 @@ int headerGet(Header h, HE_t he, unsigned int flags) + /*@modifies he, internalState @*/; + #define HEADERGET_NOEXTENSION (1 << 0) /*!< Extension search disabler. */ + #define HEADERGET_NOI18NSTRING (1 << 1) /*!< Return i18n strings as argv. */ ++#define HEADERGET_SIGHEADER (1 << 2) /*!< Override signature tag data. */ + + /** \ingroup header + * Add or append tag container to header. +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index cfd1459..374ad77 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -515,28 +515,53 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + * Validate that implicit and explicit types are identical. + * @param he tag container + */ +-void tagTypeValidate(HE_t he); +-void tagTypeValidate(HE_t he) ++void tagTypeValidate(HE_t he, unsigned int flags); ++void tagTypeValidate(HE_t he, unsigned int flags) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ +-if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; +- +-/* XXX Arbitrary tags are always strings. */ +-if ((he->tag & 0x4000) +- && (he->t ==
[OE-core] [jethro] [PATCH] rpm: Fix the Bug of SRPM String error
Add a patch 0001-Fix-the-Bug-of-SRPM-String-error.patch to fix SRPM bug When use bitbake to build a SRPM package, some sections of SRPM can't be displayed normally. For example: $ rpm -qpi zlib-1.2.8-r0.src.rpm warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY Name: zlib Version : 1.2.8 Release : r0 Architecture: i586 Install Date: (not installed) Group : ??? Size: 633007 License : Zlib Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 Source RPM : (none) Build Date : 2017???04???22??? 00???38???03??? Build Host : force Relocations : (not relocatable) Packager: PokyURL : http://zlib.net/ Summary : Description : ??? Signed-off-by: Zheng Ruoqin --- .../0001-Fix-the-Bug-of-SRPM-String-error.patch| 162 + meta/recipes-devtools/rpm/rpm_5.4.14.bb| 1 + 2 files changed, 163 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch new file mode 100644 index 000..f85e333 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-Fix-the-Bug-of-SRPM-String-error.patch @@ -0,0 +1,162 @@ +Subject: [PATCH] Fix the Bug of SRPM String error + +Upstream-Status: Backport from rpm 5.4.16 +$ rpm -qpi zlib-1.2.8-r0.src.rpm +warning: zlib-1.2.8-r0.src.rpm: Header V4 DSA/SHA1 Signature, key ID e64962a6: NOKEY +Name: zlib +Version : 1.2.8 +Release : r0 +Architecture: i586 +Install Date: (not installed) +Group : ?? +Size: 633007 +License : Zlib +Signature : DSA/SHA1, 2017???04???22??? 00???38???03???, Key ID bc5e0520e64962a6 +Source RPM : (none) +Build Date : 2017???04???22??? 00???38???03??? +Build Host : force +Relocations : (not relocatable) +Packager: Poky +URL : http://zlib.net/ +Summary : +Description : +?? + +Signed-off-by: Zheng Ruoqin +--- + rpmdb/header.c | 8 + rpmdb/rpmtag.h | 1 + + rpmdb/tagname.c | 61 - + 3 files changed, 48 insertions(+), 22 deletions(-) + +diff --git a/rpmdb/header.c b/rpmdb/header.c +index 2f72a05..0e1d613 100644 +--- a/rpmdb/header.c b/rpmdb/header.c +@@ -32,7 +32,7 @@ GENfree(HeaderIterator) + #endif/* __cplusplus */ + + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) +-extern void tagTypeValidate(HE_t he) ++extern void tagTypeValidate(HE_t he, unsigned int flags) + /*@*/; + #endif + +@@ -2273,7 +2273,7 @@ int headerGet(Header h, HE_t he, unsigned int flags) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ + if (rc) +- tagTypeValidate(he); ++ tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2296,7 +2296,7 @@ int headerPut(Header h, HE_t he, /*@unused@*/ unsigned int flags) + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +@@ -2321,7 +2321,7 @@ int headerMod(Header h, HE_t he, /*@unused@*/ unsigned int flags) + #if defined(SUPPORT_IMPLICIT_TAG_DATA_TYPES) + /*@-modfilesys@*/ + /* XXX verify that explicit and implicit types are identical. */ +-tagTypeValidate(he); ++tagTypeValidate(he, flags); + /*@=modfilesys@*/ + #endif + +diff --git a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h +index b4ad445..e5c895d 100644 +--- a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h +@@ -772,6 +772,7 @@ int headerGet(Header h, HE_t he, unsigned int flags) + /*@modifies he, internalState @*/; + #define HEADERGET_NOEXTENSION (1 << 0) /*!< Extension search disabler. */ + #define HEADERGET_NOI18NSTRING (1 << 1) /*!< Return i18n strings as argv. */ ++#define HEADERGET_SIGHEADER (1 << 2) /*!< Override signature tag data. */ + + /** \ingroup header + * Add or append tag container to header. +diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c +index c30a3c2..44fda1c 100644 +--- a/rpmdb/tagname.c b/rpmdb/tagname.c +@@ -504,28 +504,53 @@ tagStore_t tagStoreFree(tagStore_t dbiTags, size_t dbiNTags) + * Validate that implicit and explicit types are identical. + * @param he tag container + */ +-void tagTypeValidate(HE_t he); +-void tagTypeValidate(HE_t he) ++void tagTypeValidate(HE_t he, unsigned int flags); ++void tagTypeValidate(HE_t he, unsigned int flags) + { +-/* XXX Re-map RPM_I18NSTRING_TYPE -> RPM_STRING_TYPE */ +-if (he->t == RPM_I18NSTRING_TYPE) +- he->t = RPM_STRING_TYPE; +- +-/* XXX Arbitrary tags are always strings. */ +-if ((he->tag & 0x4000) +- && (he->t ==
[OE-core] [jethro][PATCH] gcc-multilib-config: make aarch64 support multilib
Fixed: MACHINE = qemuarm64 require conf/multilib.conf MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "armv7at-neon" $ bitbake core-image-minimal -cpopulate_sdk WARNING: gcc multilib setup is not supported for TARGET_ARCH=aarch64 WARNING: gcc multilib setup is not supported for TARGET_ARCH=aarch64 [YOCTO #8638] (From OE-Core rev: 0ae52c8b2c1d7d7cdbcfeeae6ff42e64f16bc41d) Signed-off-by: Robert YangSigned-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Zheng Ruoqin --- meta/recipes-devtools/gcc/gcc-multilib-config.inc | 7 +++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc index 1c0a45a..a0a2ac0 100644 --- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc +++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc @@ -29,6 +29,9 @@ python gcc_multilib_setup() { bb.utils.remove(build_conf_dir, True) ml_globs = ('%s/*/t-linux64' % src_conf_dir, '%s/*/linux64.h' % src_conf_dir, +'%s/aarch64/t-aarch64' % src_conf_dir, +'%s/aarch64/aarch64.h' % src_conf_dir, +'%s/aarch64/aarch64-cores.def' % src_conf_dir, '%s/*/linux.h' % src_conf_dir, '%s/linux.h' % src_conf_dir) @@ -130,6 +133,8 @@ python gcc_multilib_setup() { 'mips64': ['gcc/config/mips/t-linux64'], 'powerpc' : ['gcc/config/rs6000/t-linux64'], 'powerpc64' : ['gcc/config/rs6000/t-linux64'], +'aarch64' : ['gcc/config/aarch64/t-aarch64'], +'arm' : ['gcc/config/aarch64/t-aarch64'], } gcc_header_config_files = { @@ -140,6 +145,8 @@ python gcc_multilib_setup() { 'mips64': ['gcc/config/mips/linux.h', 'gcc/config/mips/linux64.h'], 'powerpc' : ['gcc/config/rs6000/linux64.h'], 'powerpc64' : ['gcc/config/rs6000/linux64.h'], +'aarch64' : ['gcc/config/aarch64/aarch64.h'], +'arm' : ['gcc/config/aarch64/aarch64.h'], } libdir32 = 'SYSTEMLIBS_DIR' -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [jethro][PATCH] sdk: fix toolchain for arm multilib
cross-canadian/libgcc-common: Fixes for arm multilib Arm is unusual in that we force it to "linux-gnueabi" and "linux" doesn't build. This was causing problems for multilib configurations which were assuming "linux" was the default compiler rather than linux-gnueabi. This change does two things, ensures symlinks are generated for linux-gnueabi and also adapts the libgcc code to account for the difference on arm. It still needs to immediately expand/save TARGET_VENDOR but we defer deciding what TARGET_OS should be until we know TARGET_ARCH (which the multilib code may change). [YOCTO #8642] Note that sanity tests of a 32 bit arm multilib still break due to issues with the kernel headers on a mixed bit system. This looks to be a general headers issue for the platform though and a different type of bug. (From OE-Core rev: b6253350fb86d8e54792905342a5892af570d526) Signed-off-by: Richard PurdieSigned-off-by: Zheng Ruoqin --- meta/classes/cross-canadian.bbclass | 1 + meta/recipes-devtools/gcc/libgcc-common.inc | 11 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index ea17f09..f60d728 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -68,6 +68,7 @@ python () { elif tarch == "mips64": d.appendVar("CANADIANEXTRAOS", " linux-gnun32 linux-uclibcn32 linux-musln32") if tarch == "arm" or tarch == "armeb": +d.appendVar("CANADIANEXTRAOS", " linux-gnueabi linux-musleabi linux-uclibceabi") d.setVar("TARGET_OS", "linux-gnueabi") else: d.setVar("TARGET_OS", "linux") diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index b09ea65..f3de9e9 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -122,15 +122,18 @@ fakeroot python do_multilib_install() { os.symlink(src, dest) } -def get_original_vendoros(d): -vendoros = d.expand('${TARGET_VENDOR}-${TARGET_OS}') +def get_original_os(d): +vendoros = d.expand('${TARGET_ARCH}${ORIG_TARGET_VENDOR}-${TARGET_OS}') for suffix in [d.getVar('ABIEXTENSION', True), d.getVar('LIBCEXTENSION', True)]: if suffix and vendoros.endswith(suffix): vendoros = vendoros[:-len(suffix)] +# Arm must use linux-gnueabi not linux as only the former is accepted by gcc +if vendoros.startswith("arm-") and not vendoros.endswith("-gnueabi"): +vendoros = vendoros + "-gnueabi" return vendoros -ORIG_TARGET_VENDOROS := "${@get_original_vendoros(d)}" -BASETARGET_SYS = "${TARGET_ARCH}${ORIG_TARGET_VENDOROS}" +ORIG_TARGET_VENDOR := "${TARGET_VENDOR}" +BASETARGET_SYS = "${@get_original_os(d)}" addtask extra_symlinks after do_multilib_install before do_package do_populate_sysroot fakeroot python do_extra_symlinks() { -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [jethro][PATCH] sdk: arm toolchain patch for multilib
The arm toolchain has a "-gnueabi" suffix, but aarch64 doesn't,this makes multilib sdk doesn't work, for example: MACHINE = qemuarm64 require conf/multilib.conf MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "armv7at-neon" $ bitbake core-image-minimal -cpopulate_sdk Then extract SDK, the environment-setup-armv7a-vfp-neon-pokymllib32-linux-gnueabi doesn't work since: * The CC is arm-pokymllib32-linux-gnueabi-gcc which doesn't exist, the patch for cross-canadian.bbclass fixes problem. * Need aarch64-poky-linux/usr/lib/arm-poky-linux-linux-gnueabi which doesn't exist, the patch for libgcc-common.inc fixes the problem. [YOCTO #8616] Signed-off-by: Robert YangSigned-off-by: Lei Maohui Signed-off-by: Zheng Ruoqin --- meta/classes/cross-canadian.bbclass | 3 +++ meta/recipes-devtools/gcc/libgcc-common.inc | 25 ++--- meta/recipes-devtools/gcc/libgcc.inc| 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index ea17f09..458185d 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -18,6 +18,7 @@ PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}" CANADIANEXTRAOS = "linux-uclibc linux-musl" CANADIANEXTRAVENDOR = "" MODIFYTOS ??= "1" +GNUEABI_SUFFIX = "" python () { archs = d.getVar('PACKAGE_ARCHS', True).split() sdkarchs = [] @@ -69,6 +70,7 @@ python () { d.appendVar("CANADIANEXTRAOS", " linux-gnun32 linux-uclibcn32 linux-musln32") if tarch == "arm" or tarch == "armeb": d.setVar("TARGET_OS", "linux-gnueabi") +d.setVar("GNUEABI_SUFFIX", "-gnueabi") else: d.setVar("TARGET_OS", "linux") @@ -167,6 +169,7 @@ SHLIBSWORKDIR = "${PKGDATA_DIR}/nativesdk-shlibs2" cross_canadian_bindirlinks () { for i in linux ${CANADIANEXTRAOS} do +i="$i${GNUEABI_SUFFIX}" for v in ${CANADIANEXTRAVENDOR} do d=${D}${bindir}/../${TARGET_ARCH}$v-$i diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index b09ea65..46f8cfd 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -134,11 +134,22 @@ BASETARGET_SYS = "${TARGET_ARCH}${ORIG_TARGET_VENDOROS}" addtask extra_symlinks after do_multilib_install before do_package do_populate_sysroot fakeroot python do_extra_symlinks() { -targetsys = d.getVar('BASETARGET_SYS', True) - -if targetsys != d.getVar('TARGET_SYS', True): -dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + targetsys -src = d.getVar('TARGET_SYS', True) -if not os.path.lexists(dest) and os.path.lexists(d.getVar('D', True) + d.getVar('libdir', True)): -os.symlink(src, dest) +base_targetsys = d.getVar('BASETARGET_SYS', True) +targetsys = d.getVar('TARGET_SYS', True) + +if base_targetsys != targetsys: +dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + base_targetsys +dest_list = [dest] +# For multilib like aarch64 + arm, need 2 symlinks: +# 1) BASETARGET_SYS as usual +# 2) BASETARGET_SYS + "-gnueabi" for multilib +libce = d.getVar('LIBCEXTENSION', True) +abie = d.getVar('ABIEXTENSION', True) +if abie and libce and targetsys.endswith(libce + abie): +dest_list.append(dest + libce + abie) +src = targetsys +for dir in dest_list: +if not os.path.lexists(dir) and os.path.lexists(d.getVar('D', True) + d.getVar('libdir', True)): +os.symlink(src, dir) } + diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index 95fa3f4..f6a0a8c 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -17,7 +17,7 @@ LICENSE_${PN}-dbg = "GPL-3.0-with-GCC-exception" FILES_${PN}-dev = "\ ${base_libdir}/libgcc*.so \ -${@base_conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \ +${@base_conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}*', d)} \ ${libdir}/${TARGET_SYS}/${BINV}* \ " -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] busybox: 1.24.1 -> 1.26.2
1) Upgrade busybox from 1.24.1 to 1.26.2 2) Delete 12 patches below, since they are integrated upstream. busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch busybox/0001-libiproute-handle-table-ids-larger-than-255.patch busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch busybox/CVE-2016-2147.patch busybox/CVE-2016-2147_2.patch busybox/CVE-2016-2148.patch busybox/busybox-1.24.1-truncate-open-mode.patch busybox/busybox-1.24.1-unzip-regression.patch busybox/busybox-1.24.1-unzip.patch busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch busybox/commit-applet_tables-fix-commit-0dddbc1.patch busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch 3) Modify 3 patches below to make it compatible with new version busybox/busybox-cross-menuconfig.patch busybox/busybox-udhcpc-no_deconfig.patch busybox/makefile-fix-backport.patch Signed-off-by: Zheng Ruoqin--- ...e-the-behaviour-of-c-parameter-to-match-u.patch | 64 - ...biproute-handle-table-ids-larger-than-255.patch | 134 --- ...-n-flushes-pattern-space-terminates-early.patch | 72 --- .../busybox/busybox/CVE-2016-2147.patch| 57 .../busybox/busybox/CVE-2016-2147_2.patch | 32 - .../busybox/busybox/CVE-2016-2148.patch| 74 --- .../busybox-1.24.1-truncate-open-mode.patch| 81 .../busybox/busybox-1.24.1-unzip-regression.patch | 143 - .../busybox/busybox/busybox-1.24.1-unzip.patch | 118 - .../busybox/busybox/busybox-cross-menuconfig.patch | 70 +- .../busybox-kbuild-race-fix-commit-d8e61bb.patch | 53 .../busybox/busybox-udhcpc-no_deconfig.patch | 70 +- .../commit-applet_tables-fix-commit-0dddbc1.patch | 61 - ...lem_on_mips64_n64_big_endian_musl_systems.patch | 90 - .../busybox/busybox/makefile-fix-backport.patch| 30 ++--- .../{busybox_1.24.1.bb => busybox_1.26.2.bb} | 16 +-- 16 files changed, 88 insertions(+), 1077 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch delete mode 100644 meta/recipes-core/busybox/busybox/0001-libiproute-handle-table-ids-larger-than-255.patch delete mode 100644 meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2147.patch delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2147_2.patch delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2148.patch delete mode 100644 meta/recipes-core/busybox/busybox/busybox-1.24.1-truncate-open-mode.patch delete mode 100644 meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip-regression.patch delete mode 100644 meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip.patch delete mode 100644 meta/recipes-core/busybox/busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch delete mode 100644 meta/recipes-core/busybox/busybox/commit-applet_tables-fix-commit-0dddbc1.patch delete mode 100644 meta/recipes-core/busybox/busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch rename meta/recipes-core/busybox/{busybox_1.24.1.bb => busybox_1.26.2.bb} (66%) diff --git a/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch b/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch deleted file mode 100644 index 78520f0..000 --- a/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e1d426fd65c00a6d01a10d85edf8a294ae8a2d2b Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Sun, 24 Apr 2016 18:19:49 +0200 -Subject: [PATCH] flock: fix -c; improve error handling of fork+exec - -function old new delta -flock_main 254 334 +80 - -Upstream-Status: Backport - -Signed-off-by: Denys Vlasenko -Signed-off-by: Maxin B. John - util-linux/flock.c | 19 +-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -diff --git a/util-linux/flock.c b/util-linux/flock.c -index 05a747f..539a835 100644 a/util-linux/flock.c -+++ b/util-linux/flock.c -@@ -57,7 +57,6 @@ int flock_main(int argc UNUSED_PARAM, char **argv) - /* If it is "flock FILE -c PROG", then -c isn't caught by getopt32: -* we use "+" in order to support "flock -opt FILE PROG -with-opts", -* we need to remove -c by hand. -- * TODO: in upstream, -c 'PROG ARGS' means "run sh -c 'PROG ARGS'" -*/ - if (argv[0] -&& argv[0][0] == '-' -@@ -66,6 +65,9 @@ int