Re: [OE-core] [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification
Hi all Sorry, commit log is too simple. These two patches aim to make the spdx file meet the SPDX 1.2 Version Specification. The main changes are: 1. use curl command instead of wget when get spdx file from FOSSologySPDX instance server. Before apply these patches, the command is : wget -qO - --no-check-certificate --timeout=0 --post-file=xxx/yyy/zzz.tar.gz http://localhost//?mod=spdx_license_oncenoCopyright=${FOSS_COPYRIGHT}recursiveUnpack=${FOSS_RECURSIVE_UNPACK} After apply these patches, the command is : curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@ xxx/yyy/zzz.tar.gz -o xxx/yyy/zzz.spdx Because if use wget command,the Mandatory fields of the SPDX Specification such as the following can't be obtained. 1) PackageLicenseInfoFromFiles(Package Information) 2) PackageLicenseDeclared(Package Information) 3) LicenseID(License Information) 4) ExtractedText(License Information) 5) LicenseName(License Information) 2. In order to avoid the SPDX_S be polluted in the rebuild, I make ${WORKDIR}/${SPDX_TEMP_DIR} to save the source after do_patch. 3. In addition, this patch add some more info that meet the SPDX 1.2 Version Specification. After apply this patch, users only have to add INHERIT += spdx in the local.conf file, they can get spdx file that meet the SPDX 1.2 Version Specification. Cheers Lei Maohui -Original Message- From: Lei, Maohui/雷 茂慧 Sent: Monday, November 24, 2014 9:49 PM To: openembedded-core@lists.openembedded.org Cc: Lei, Maohui/雷 茂慧 Subject: [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification Signed-off-by: leimaohui leimao...@cn.fujitsu.com --- meta/classes/spdx.bbclass | 427 -- 1 file changed, 150 insertions(+), 277 deletions(-) diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index 454c53e..9f0f120 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -15,178 +15,179 @@ # SPDX file will be output to the path which is defined as[SPDX_MANIFEST_DIR] # in ./meta/conf/licenses.conf. +SPDXOUTPUTDIR = ${WORKDIR}/spdx_output_dir SPDXSSTATEDIR = ${WORKDIR}/spdx_sstate_dir # If ${S} isn't actually the top-level source directory, set SPDX_S to point at # the real top-level directory. + SPDX_S ?= ${S} python do_spdx () { import os, sys -import json, shutil +import json info = {} info['workdir'] = d.getVar('WORKDIR', True) -info['sourcedir'] = d.getVar('SPDX_S', True) -info['pn'] = d.getVar('PN', True) -info['pv'] = d.getVar('PV', True) +info['pn'] = d.getVar( 'PN', True ) +info['pv'] = d.getVar( 'PV', True ) +info['package_download_location'] = d.getVar( 'SRC_URI', True + ).split()[0] info['spdx_version'] = d.getVar('SPDX_VERSION', True) info['data_license'] = d.getVar('DATA_LICENSE', True) +info['creator'] = {} +info['creator']['Tool'] = d.getVar('CREATOR_TOOL', True) +info['license_list_version'] = d.getVar('LICENSELISTVERSION', True) +info['package_homepage'] = d.getVar('HOMEPAGE', True) +info['package_summary'] = d.getVar('SUMMARY', True) -sstatedir = d.getVar('SPDXSSTATEDIR', True) -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + .spdx) - +spdx_sstate_dir = d.getVar('SPDXSSTATEDIR', True) manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) info['outfile'] = os.path.join(manifest_dir, info['pn'] + .spdx ) - -info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) -info['tar_file'] = os.path.join(info['workdir'], info['pn'] + .tar.gz ) - +sstatefile = os.path.join(spdx_sstate_dir, +info['pn'] + info['pv'] + .spdx ) +info['tar_file'] = os.path.join( info['workdir'], info['pn'] + + .tar.gz ) + # Make sure important dirs exist try: bb.utils.mkdirhier(manifest_dir) -bb.utils.mkdirhier(sstatedir) -bb.utils.mkdirhier(info['spdx_temp_dir']) +bb.utils.mkdirhier(spdx_sstate_dir) except OSError as e: bb.error(SPDX: Could not set up required directories: + str(e)) return ## get everything from cache. use it to decide if -## something needs to be rerun -cur_ver_code = get_ver_code(info['sourcedir']) +## something needs to be rerun +d.setVar('WORKDIR', d.getVar('SPDX_TEMP_DIR', True)) +info['sourcedir'] = (d.getVar('SPDX_S', True) or ) +cur_ver_code = get_ver_code(info['sourcedir']).split()[0] cache_cur = False -if os.path.exists(sstatefile): +if os.path.exists( sstatefile ): ## cache for this package exists. read it in -cached_spdx = get_cached_spdx(sstatefile) - -if cached_spdx['PackageVerificationCode'] == cur_ver_code: +cached_spdx
[OE-core] FW: [PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification
Hi all How about this patch? I have submitted for days, but still no responds. Cheers Lei Maohui -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui Sent: Tuesday, November 25, 2014 9:32 AM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification Hi all Sorry, commit log is too simple. These two patches aim to make the spdx file meet the SPDX 1.2 Version Specification. The main changes are: 1. use curl command instead of wget when get spdx file from FOSSologySPDX instance server. Before apply these patches, the command is : wget -qO - --no-check-certificate --timeout=0 --post-file=xxx/yyy/zzz.tar.gz http://localhost//?mod=spdx_license_oncenoCopyright=${FOSS_COPYRIGHT}rec ursiveUnpack=${FOSS_RECURSIVE_UNPACK} After apply these patches, the command is : curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@ xxx/yyy/zzz.tar.gz -o xxx/yyy/zzz.spdx Because if use wget command,the Mandatory fields of the SPDX Specification such as the following can't be obtained. 1) PackageLicenseInfoFromFiles(Package Information) 2) PackageLicenseDeclared(Package Information) 3) LicenseID(License Information) 4) ExtractedText(License Information) 5) LicenseName(License Information) 2. In order to avoid the SPDX_S be polluted in the rebuild, I make ${WORKDIR}/${SPDX_TEMP_DIR} to save the source after do_patch. 3. In addition, this patch add some more info that meet the SPDX 1.2 Version Specification. After apply this patch, users only have to add INHERIT += spdx in the local.conf file, they can get spdx file that meet the SPDX 1.2 Version Specification. Cheers Lei Maohui -Original Message- From: Lei, Maohui/雷 茂慧 Sent: Monday, November 24, 2014 9:49 PM To: openembedded-core@lists.openembedded.org Cc: Lei, Maohui/雷 茂慧 Subject: [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification Signed-off-by: leimaohui leimao...@cn.fujitsu.com --- meta/classes/spdx.bbclass | 427 -- 1 file changed, 150 insertions(+), 277 deletions(-) diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index 454c53e..9f0f120 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -15,178 +15,179 @@ # SPDX file will be output to the path which is defined as[SPDX_MANIFEST_DIR] # in ./meta/conf/licenses.conf. +SPDXOUTPUTDIR = ${WORKDIR}/spdx_output_dir SPDXSSTATEDIR = ${WORKDIR}/spdx_sstate_dir # If ${S} isn't actually the top-level source directory, set SPDX_S to point at # the real top-level directory. + SPDX_S ?= ${S} python do_spdx () { import os, sys -import json, shutil +import json info = {} info['workdir'] = d.getVar('WORKDIR', True) -info['sourcedir'] = d.getVar('SPDX_S', True) -info['pn'] = d.getVar('PN', True) -info['pv'] = d.getVar('PV', True) +info['pn'] = d.getVar( 'PN', True ) +info['pv'] = d.getVar( 'PV', True ) +info['package_download_location'] = d.getVar( 'SRC_URI', True + ).split()[0] info['spdx_version'] = d.getVar('SPDX_VERSION', True) info['data_license'] = d.getVar('DATA_LICENSE', True) +info['creator'] = {} +info['creator']['Tool'] = d.getVar('CREATOR_TOOL', True) +info['license_list_version'] = d.getVar('LICENSELISTVERSION', True) +info['package_homepage'] = d.getVar('HOMEPAGE', True) +info['package_summary'] = d.getVar('SUMMARY', True) -sstatedir = d.getVar('SPDXSSTATEDIR', True) -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + .spdx) - +spdx_sstate_dir = d.getVar('SPDXSSTATEDIR', True) manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) info['outfile'] = os.path.join(manifest_dir, info['pn'] + .spdx ) - -info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) -info['tar_file'] = os.path.join(info['workdir'], info['pn'] + .tar.gz ) - +sstatefile = os.path.join(spdx_sstate_dir, +info['pn'] + info['pv'] + .spdx ) +info['tar_file'] = os.path.join( info['workdir'], info['pn'] + + .tar.gz ) + # Make sure important dirs exist try: bb.utils.mkdirhier(manifest_dir) -bb.utils.mkdirhier(sstatedir) -bb.utils.mkdirhier(info['spdx_temp_dir']) +bb.utils.mkdirhier(spdx_sstate_dir) except OSError as e: bb.error(SPDX: Could not set up required directories: + str(e)) return ## get everything from cache. use it to decide if -## something needs to be rerun
Re: [OE-core] [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification
ping -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui Sent: Tuesday, November 25, 2014 9:32 AM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification Hi all Sorry, commit log is too simple. These two patches aim to make the spdx file meet the SPDX 1.2 Version Specification. The main changes are: 1. use curl command instead of wget when get spdx file from FOSSologySPDX instance server. Before apply these patches, the command is : wget -qO - --no-check-certificate --timeout=0 --post-file=xxx/yyy/zzz.tar.gz http://localhost//?mod=spdx_license_oncenoCopyright=${FOSS_COPYRIGHT}rec ursiveUnpack=${FOSS_RECURSIVE_UNPACK} After apply these patches, the command is : curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@ xxx/yyy/zzz.tar.gz -o xxx/yyy/zzz.spdx Because if use wget command,the Mandatory fields of the SPDX Specification such as the following can't be obtained. 1) PackageLicenseInfoFromFiles(Package Information) 2) PackageLicenseDeclared(Package Information) 3) LicenseID(License Information) 4) ExtractedText(License Information) 5) LicenseName(License Information) 2. In order to avoid the SPDX_S be polluted in the rebuild, I make ${WORKDIR}/${SPDX_TEMP_DIR} to save the source after do_patch. 3. In addition, this patch add some more info that meet the SPDX 1.2 Version Specification. After apply this patch, users only have to add INHERIT += spdx in the local.conf file, they can get spdx file that meet the SPDX 1.2 Version Specification. Cheers Lei Maohui -Original Message- From: Lei, Maohui/雷 茂慧 Sent: Monday, November 24, 2014 9:49 PM To: openembedded-core@lists.openembedded.org Cc: Lei, Maohui/雷 茂慧 Subject: [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification Signed-off-by: leimaohui leimao...@cn.fujitsu.com --- meta/classes/spdx.bbclass | 427 -- 1 file changed, 150 insertions(+), 277 deletions(-) diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index 454c53e..9f0f120 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -15,178 +15,179 @@ # SPDX file will be output to the path which is defined as[SPDX_MANIFEST_DIR] # in ./meta/conf/licenses.conf. +SPDXOUTPUTDIR = ${WORKDIR}/spdx_output_dir SPDXSSTATEDIR = ${WORKDIR}/spdx_sstate_dir # If ${S} isn't actually the top-level source directory, set SPDX_S to point at # the real top-level directory. + SPDX_S ?= ${S} python do_spdx () { import os, sys -import json, shutil +import json info = {} info['workdir'] = d.getVar('WORKDIR', True) -info['sourcedir'] = d.getVar('SPDX_S', True) -info['pn'] = d.getVar('PN', True) -info['pv'] = d.getVar('PV', True) +info['pn'] = d.getVar( 'PN', True ) +info['pv'] = d.getVar( 'PV', True ) +info['package_download_location'] = d.getVar( 'SRC_URI', True + ).split()[0] info['spdx_version'] = d.getVar('SPDX_VERSION', True) info['data_license'] = d.getVar('DATA_LICENSE', True) +info['creator'] = {} +info['creator']['Tool'] = d.getVar('CREATOR_TOOL', True) +info['license_list_version'] = d.getVar('LICENSELISTVERSION', True) +info['package_homepage'] = d.getVar('HOMEPAGE', True) +info['package_summary'] = d.getVar('SUMMARY', True) -sstatedir = d.getVar('SPDXSSTATEDIR', True) -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + .spdx) - +spdx_sstate_dir = d.getVar('SPDXSSTATEDIR', True) manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) info['outfile'] = os.path.join(manifest_dir, info['pn'] + .spdx ) - -info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) -info['tar_file'] = os.path.join(info['workdir'], info['pn'] + .tar.gz ) - +sstatefile = os.path.join(spdx_sstate_dir, +info['pn'] + info['pv'] + .spdx ) +info['tar_file'] = os.path.join( info['workdir'], info['pn'] + + .tar.gz ) + # Make sure important dirs exist try: bb.utils.mkdirhier(manifest_dir) -bb.utils.mkdirhier(sstatedir) -bb.utils.mkdirhier(info['spdx_temp_dir']) +bb.utils.mkdirhier(spdx_sstate_dir) except OSError as e: bb.error(SPDX: Could not set up required directories: + str(e)) return ## get everything from cache. use it to decide if -## something needs to be rerun -cur_ver_code = get_ver_code(info['sourcedir']) +## something needs to be rerun
Re: [OE-core] [PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification
Ping . Could someone give me some suggestions ? Cheers Lei Maohui -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui Sent: Monday, December 01, 2014 9:37 AM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification ping -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui Sent: Tuesday, November 25, 2014 9:32 AM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification Hi all Sorry, commit log is too simple. These two patches aim to make the spdx file meet the SPDX 1.2 Version Specification. The main changes are: 1. use curl command instead of wget when get spdx file from FOSSologySPDX instance server. Before apply these patches, the command is : wget -qO - --no-check-certificate --timeout=0 --post-file=xxx/yyy/zzz.tar.gz http://localhost//?mod=spdx_license_oncenoCopyright=${FOSS_COPYRIGHT} rec ursiveUnpack=${FOSS_RECURSIVE_UNPACK} After apply these patches, the command is : curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@ xxx/yyy/zzz.tar.gz -o xxx/yyy/zzz.spdx Because if use wget command,the Mandatory fields of the SPDX Specification such as the following can't be obtained. 1) PackageLicenseInfoFromFiles(Package Information) 2) PackageLicenseDeclared(Package Information) 3) LicenseID(License Information) 4) ExtractedText(License Information) 5) LicenseName(License Information) 2. In order to avoid the SPDX_S be polluted in the rebuild, I make ${WORKDIR}/${SPDX_TEMP_DIR} to save the source after do_patch. 3. In addition, this patch add some more info that meet the SPDX 1.2 Version Specification. After apply this patch, users only have to add INHERIT += spdx in the local.conf file, they can get spdx file that meet the SPDX 1.2 Version Specification. Cheers Lei Maohui -Original Message- From: Lei, Maohui/雷 茂慧 Sent: Monday, November 24, 2014 9:49 PM To: openembedded-core@lists.openembedded.org Cc: Lei, Maohui/雷 茂慧 Subject: [oe-core][PATCH 1/2] spdx: Provide spdx file that meet SPDX 1.2 Version Specification Signed-off-by: leimaohui leimao...@cn.fujitsu.com --- meta/classes/spdx.bbclass | 427 -- 1 file changed, 150 insertions(+), 277 deletions(-) diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index 454c53e..9f0f120 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -15,178 +15,179 @@ # SPDX file will be output to the path which is defined as[SPDX_MANIFEST_DIR] # in ./meta/conf/licenses.conf. +SPDXOUTPUTDIR = ${WORKDIR}/spdx_output_dir SPDXSSTATEDIR = ${WORKDIR}/spdx_sstate_dir # If ${S} isn't actually the top-level source directory, set SPDX_S to point at # the real top-level directory. + SPDX_S ?= ${S} python do_spdx () { import os, sys -import json, shutil +import json info = {} info['workdir'] = d.getVar('WORKDIR', True) -info['sourcedir'] = d.getVar('SPDX_S', True) -info['pn'] = d.getVar('PN', True) -info['pv'] = d.getVar('PV', True) +info['pn'] = d.getVar( 'PN', True ) +info['pv'] = d.getVar( 'PV', True ) +info['package_download_location'] = d.getVar( 'SRC_URI', True + ).split()[0] info['spdx_version'] = d.getVar('SPDX_VERSION', True) info['data_license'] = d.getVar('DATA_LICENSE', True) +info['creator'] = {} +info['creator']['Tool'] = d.getVar('CREATOR_TOOL', True) +info['license_list_version'] = d.getVar('LICENSELISTVERSION', True) +info['package_homepage'] = d.getVar('HOMEPAGE', True) +info['package_summary'] = d.getVar('SUMMARY', True) -sstatedir = d.getVar('SPDXSSTATEDIR', True) -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + .spdx) - +spdx_sstate_dir = d.getVar('SPDXSSTATEDIR', True) manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) info['outfile'] = os.path.join(manifest_dir, info['pn'] + .spdx ) - -info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) -info['tar_file'] = os.path.join(info['workdir'], info['pn'] + .tar.gz ) - +sstatefile = os.path.join(spdx_sstate_dir, +info['pn'] + info['pv'] + .spdx ) +info['tar_file'] = os.path.join( info['workdir'], info['pn'] + + .tar.gz
[OE-core] [PATCH v2]gcc: upgrade to 4.9.2 and fix the bug #6824
The new patches 0060-Only-xxx and 0061-Fix-xxx aim to fix the bug in e500v2 as following: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63908 . Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/recipes-devtools/gcc/gcc-4.9.inc | 12 +- ...e500-double-in-SPE_SIMD_REGNO_P-registers.patch | 33 .../0061-Fix-for-unwinder-aborts-on-e500.patch | 193 + 3 files changed, 232 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500.patch diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 2568e99..e0b291e 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -2,11 +2,11 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = 4.9.1 +PV = 4.9.2 # BINV should be incremented to a revision after a minor gcc release -BINV = 4.9.1 +BINV = 4.9.2 FILESEXTRAPATHS =. ${FILE_DIRNAME}/gcc-4.9: @@ -69,14 +69,14 @@ SRC_URI = \ file://0051-eabispe.patch \ file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \ file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \ -file://0055-PR-rtl-optimization-61801.patch \ file://0056-top-level-reorder_gcc-bug-61144.patch \ -file://0057-aarch64-config.patch \ file://0058-gcc-r212171.patch \ file://0059-gcc-PR-rtl-optimization-63348.patch \ +file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \ +file://0061-Fix-for-unwinder-aborts-on-e500.patch \ -SRC_URI[md5sum] = fddf71348546af523353bd43d34919c1 -SRC_URI[sha256sum] = d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e +SRC_URI[md5sum] = 4df8ee253b7f3863ad0b86359cd39c43 +SRC_URI[sha256sum] = 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd S = ${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV} B = ${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS} diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch new file mode 100644 index 000..44343bc --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch @@ -0,0 +1,33 @@ +backport to fix the bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63908 . + +2014-10-25 Joseph Myers jos...@codesourcery.com + +* config/rs6000/rs6000.c (rs6000_hard_regno_nregs_internal): Do +not allow e500 double in registers not satisyfing +SPE_SIMD_REGNO_P. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216688 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport [https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63908] +Note : This patch though presents in upstream trunk, have not been back-ported to gcc-4_9-branch. + +--- + gcc/config/rs6000/rs6000.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c +index e1a226c..eab0a49 100644 +--- a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c +@@ -1703,7 +1703,7 @@ rs6000_hard_regno_nregs_internal (int regno, enum machine_mode mode) + SCmode so as to pass the value correctly in a pair of + registers. */ + else if (TARGET_E500_DOUBLE FLOAT_MODE_P (mode) mode != SCmode +- !DECIMAL_FLOAT_MODE_P (mode)) ++!DECIMAL_FLOAT_MODE_P (mode) SPE_SIMD_REGNO_P (regno)) + reg_size = UNITS_PER_FP_WORD; + + else +-- +1.8.4.2 + diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500.patch b/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500.patch new file mode 100644 index 000..52ceb2c --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500.patch @@ -0,0 +1,193 @@ +backport to fix the bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63908 . + +2014-12-05 Olivier Hainque hain...@adacore.com + +gcc/ +* defaults.h: (DWARF_REG_TO_UNWIND_COLUMN): Define default. +* dwarf2cfi.c (init_one_dwarf_reg_size): Honor +DWARF_REG_TO_UNWIND_COLUMN. + +libgcc/ +* unwind-dw2.c (DWARF_REG_TO_UNWIND_COLUMN): Remove default def, +now provided by defaults.h. + +2014-12-05 Olivier Hainque hain...@adacore.com + +* dwarf2cfi.c (init_one_dwarf_reg_size): New helper, processing +one particular reg for expand_builtin_init_dwarf_reg_sizes. +(expand_builtin_init_dwarf_reg_sizes): Rework to use helper and +account for dwarf register spans. + +Upstream-Status: Backport +Note: This patch though presents
[OE-core] [oe-core][PATCH] libidn_0.6.14: fix the QA Issue
To fix the QA Issue as following: ERROR: QA Issue: libidn: Files/directories were installed but not shipped /usr/share/emacs /usr/share/emacs/site-lisp /usr/share/emacs/site-lisp/punycode.el /usr/share/emacs/site-lisp/idna.el [installed-vs-shipped] Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/recipes-extended/libidn/libidn_0.6.14.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/libidn/libidn_0.6.14.bb b/meta/recipes-extended/libidn/libidn_0.6.14.bb index ff8d345..4df1d08 100644 --- a/meta/recipes-extended/libidn/libidn_0.6.14.bb +++ b/meta/recipes-extended/libidn/libidn_0.6.14.bb @@ -29,4 +29,5 @@ do_configure_prepend() { do_install_append() { rm -rf ${D}${libdir}/Libidn.dll + rm -rf ${D}${datadir}/emacs } -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc: upgrade to 4.9.2 and fix the bug #6824
Hi Armin I think all the two patches need an Upstream-Status: statement. OK. I will modify my patch and submit it again. Cheers Lei Maohui -Original Message- From: akuster808 [mailto:akuster...@gmail.com] Sent: Monday, January 12, 2015 12:09 PM To: Lei, Maohui/雷 茂慧; openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] gcc: upgrade to 4.9.2 and fix the bug #6824 Lei, I think all the two patches need an Upstream-Status: statement. - Armin On 01/11/2015 07:12 PM, Lei Maohui wrote: fix the yocto bug #6824 backport from gcc Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/recipes-devtools/gcc/gcc-4.9.inc | 12 +- ...e500-double-in-SPE_SIMD_REGNO_P-registers.patch | 13 ++ .../0061-Fix-for-unwinder-aborts-on-e500.patch | 161 + 3 files changed, 180 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_ REGNO_P-registers.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500 .patch diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 2568e99..c4ec40d 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -2,11 +2,11 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = 4.9.1 +PV = 4.9.2 # BINV should be incremented to a revision after a minor gcc release -BINV = 4.9.1 +BINV = 4.9.2 FILESEXTRAPATHS =. ${FILE_DIRNAME}/gcc-4.9: @@ -69,11 +69,11 @@ SRC_URI = \ file://0051-eabispe.patch \ file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \ file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \ -file://0055-PR-rtl-optimization-61801.patch \ file://0056-top-level-reorder_gcc-bug-61144.patch \ -file://0057-aarch64-config.patch \ file://0058-gcc-r212171.patch \ file://0059-gcc-PR-rtl-optimization-63348.patch \ + file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \ +file://0061-Fix-for-unwinder-aborts-on-e500.patch \ SRC_URI[md5sum] = fddf71348546af523353bd43d34919c1 SRC_URI[sha256sum] = d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e @@ -125,8 +125,8 @@ EXTRA_OECONF_INTERMEDIATE = \ EXTRA_OECONF_append_libc-uclibc = --disable-decimal-float EXTRA_OECONF_PATHS = \ ---with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ ---with-sysroot=/not/exist \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BIN V} \ +--with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE _SIMD_REGNO_P-registers.patch b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE _SIMD_REGNO_P-registers.patch new file mode 100644 index 000..810ff90 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in +++ -SPE_SIMD_REGNO_P-registers.patch @@ -0,0 +1,13 @@ +diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c +index 512e7d6..292fb2c 100644 +--- a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c +@@ -1704,7 +1704,7 @@ rs6000_hard_regno_nregs_internal (int regno, enum machine_mode mode) + SCmode so as to pass the value correctly in a pair of + registers. */ + else if (TARGET_E500_DOUBLE FLOAT_MODE_P (mode) mode != SCmode +- !DECIMAL_FLOAT_MODE_P (mode)) ++!DECIMAL_FLOAT_MODE_P (mode) SPE_SIMD_REGNO_P ++ (regno)) + reg_size = UNITS_PER_FP_WORD; + + else diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e5 00.patch b/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e5 00.patch new file mode 100644 index 000..c37a4c3 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-o +++ n-e500.patch @@ -0,0 +1,161 @@ +diff --git a/gcc/defaults.h b/gcc/defaults.h index f94ae17..80a798f +100644 +--- a/gcc/defaults.h b/gcc/defaults.h +@@ -438,6 +438,11 @@ see the files COPYING3 and COPYING.RUNTIME +respectively. If not, see #define DWARF_FRAME_REGNUM(REG) +DBX_REGISTER_NUMBER (REG) #endif + ++/* The mapping from dwarf CFA reg number to internal dwarf reg ++numbers. */ #ifndef DWARF_REG_TO_UNWIND_COLUMN #define ++DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO) #endif ++ + /* Map register numbers held in the call frame info that gcc has +collected using DWARF_FRAME_REGNUM to those that should be output in +.debug_frame and .eh_frame. */ +diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c index abcdeb3..4e59dfe
[OE-core] [PATCH] gcc: upgrade to 4.9.2 and fix the bug #6824
fix the yocto bug #6824 backport from gcc Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/recipes-devtools/gcc/gcc-4.9.inc | 12 +- ...e500-double-in-SPE_SIMD_REGNO_P-registers.patch | 13 ++ .../0061-Fix-for-unwinder-aborts-on-e500.patch | 161 + 3 files changed, 180 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500.patch diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 2568e99..c4ec40d 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -2,11 +2,11 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = 4.9.1 +PV = 4.9.2 # BINV should be incremented to a revision after a minor gcc release -BINV = 4.9.1 +BINV = 4.9.2 FILESEXTRAPATHS =. ${FILE_DIRNAME}/gcc-4.9: @@ -69,11 +69,11 @@ SRC_URI = \ file://0051-eabispe.patch \ file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \ file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \ -file://0055-PR-rtl-optimization-61801.patch \ file://0056-top-level-reorder_gcc-bug-61144.patch \ -file://0057-aarch64-config.patch \ file://0058-gcc-r212171.patch \ file://0059-gcc-PR-rtl-optimization-63348.patch \ +file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \ +file://0061-Fix-for-unwinder-aborts-on-e500.patch \ SRC_URI[md5sum] = fddf71348546af523353bd43d34919c1 SRC_URI[sha256sum] = d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e @@ -125,8 +125,8 @@ EXTRA_OECONF_INTERMEDIATE = \ EXTRA_OECONF_append_libc-uclibc = --disable-decimal-float EXTRA_OECONF_PATHS = \ ---with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ ---with-sysroot=/not/exist \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ +--with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch new file mode 100644 index 000..810ff90 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch @@ -0,0 +1,13 @@ +diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c +index 512e7d6..292fb2c 100644 +--- a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c +@@ -1704,7 +1704,7 @@ rs6000_hard_regno_nregs_internal (int regno, enum machine_mode mode) + SCmode so as to pass the value correctly in a pair of + registers. */ + else if (TARGET_E500_DOUBLE FLOAT_MODE_P (mode) mode != SCmode +- !DECIMAL_FLOAT_MODE_P (mode)) ++!DECIMAL_FLOAT_MODE_P (mode) SPE_SIMD_REGNO_P (regno)) + reg_size = UNITS_PER_FP_WORD; + + else diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500.patch b/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500.patch new file mode 100644 index 000..c37a4c3 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500.patch @@ -0,0 +1,161 @@ +diff --git a/gcc/defaults.h b/gcc/defaults.h +index f94ae17..80a798f 100644 +--- a/gcc/defaults.h b/gcc/defaults.h +@@ -438,6 +438,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + #define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG) + #endif + ++/* The mapping from dwarf CFA reg number to internal dwarf reg numbers. */ ++#ifndef DWARF_REG_TO_UNWIND_COLUMN ++#define DWARF_REG_TO_UNWIND_COLUMN(REGNO) (REGNO) ++#endif ++ + /* Map register numbers held in the call frame info that gcc has +collected using DWARF_FRAME_REGNUM to those that should be output in +.debug_frame and .eh_frame. */ +diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c +index abcdeb3..4e59dfe 100644 +--- a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c +@@ -252,7 +252,60 @@ init_return_column_size (enum machine_mode mode, rtx mem, unsigned int c) + gen_int_mode (size, mode)); + } + +-/* Generate code to initialize the register size table. */ ++/* Datastructure used by expand_builtin_init_dwarf_reg_sizes and ++ init_one_dwarf_reg_size to communicate on what has been done by the ++ latter. */ ++ ++typedef struct ++{ ++ /* Whether the dwarf return column was initialized. */ ++ bool wrote_return_column; ++ ++ /* For each hard register REGNO, whether init_one_dwarf_reg_size ++ was given REGNO to process already. */ ++ bool processed_regno [FIRST_PSEUDO_REGISTER]; ++ ++} init_one_dwarf_reg_state; ++ ++/* Helper
Re: [OE-core] [PATCH] gcc: upgrade to 4.9.2 and fix the bug #6824
Hi Richard I can't spot the upgrade from 4.9.1 to 4.9.2 in here. The SRC_URI checksums are unchanged for example? Is there part of the patch missing? When I bitbake the gcc-4.9.2, there is no error or warning message about the checksums. But it did wrong. [downloads]$ md5sum gcc-4.9.2.tar.bz2 gcc-4.9.2.tar.bz2.sum [downloads]$ cat gcc-4.9.2.tar.bz2.sum 4df8ee253b7f3863ad0b86359cd39c43 gcc-4.9.2.tar.bz2 [downloads]$ I noticed that there is a file named gcc-4.9.2.tar.bz2_bad-checksum_4df8ee253b7f3863ad0b86359cd39c43 in my download directory. I don't know why. I think md5sum will be checked automatically. Is it a bug? Cheers, Lei -Original Message- From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] Sent: Monday, January 12, 2015 5:19 PM To: Lei, Maohui/雷 茂慧 Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] gcc: upgrade to 4.9.2 and fix the bug #6824 On Mon, 2015-01-12 at 11:12 +0800, Lei Maohui wrote: fix the yocto bug #6824 backport from gcc Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/recipes-devtools/gcc/gcc-4.9.inc | 12 +- ...e500-double-in-SPE_SIMD_REGNO_P-registers.patch | 13 ++ .../0061-Fix-for-unwinder-aborts-on-e500.patch | 161 + 3 files changed, 180 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_S IMD_REGNO_P-registers.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500 .patch diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 2568e99..c4ec40d 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -2,11 +2,11 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = 4.9.1 +PV = 4.9.2 # BINV should be incremented to a revision after a minor gcc release -BINV = 4.9.1 +BINV = 4.9.2 I can't spot the upgrade from 4.9.1 to 4.9.2 in here. The SRC_URI checksums are unchanged for example? Is there part of the patch missing? Cheers, Richard FILESEXTRAPATHS =. ${FILE_DIRNAME}/gcc-4.9: @@ -69,11 +69,11 @@ SRC_URI = \ file://0051-eabispe.patch \ file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \ file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \ -file://0055-PR-rtl-optimization-61801.patch \ file://0056-top-level-reorder_gcc-bug-61144.patch \ -file://0057-aarch64-config.patch \ file://0058-gcc-r212171.patch \ file://0059-gcc-PR-rtl-optimization-63348.patch \ + file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \ +file://0061-Fix-for-unwinder-aborts-on-e500.patch \ SRC_URI[md5sum] = fddf71348546af523353bd43d34919c1 SRC_URI[sha256sum] = d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e @@ -125,8 +125,8 @@ EXTRA_OECONF_INTERMEDIATE = \ EXTRA_OECONF_append_libc-uclibc = --disable-decimal-float EXTRA_OECONF_PATHS = \ ---with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ ---with-sysroot=/not/exist \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BIN V} \ +--with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE _SIMD_REGNO_P-registers.patch b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE _SIMD_REGNO_P-registers.patch new file mode 100644 index 000..810ff90 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in +++ -SPE_SIMD_REGNO_P-registers.patch @@ -0,0 +1,13 @@ +diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c +index 512e7d6..292fb2c 100644 +--- a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c +@@ -1704,7 +1704,7 @@ rs6000_hard_regno_nregs_internal (int regno, enum machine_mode mode) + SCmode so as to pass the value correctly in a pair of + registers. */ + else if (TARGET_E500_DOUBLE FLOAT_MODE_P (mode) mode != SCmode +- !DECIMAL_FLOAT_MODE_P (mode)) ++!DECIMAL_FLOAT_MODE_P (mode) SPE_SIMD_REGNO_P ++ (regno)) + reg_size = UNITS_PER_FP_WORD; + + else diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e5 00.patch b/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e5 00.patch new file mode 100644 index 000..c37a4c3 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-o +++ n-e500.patch @@ -0,0 +1,161 @@ +diff --git a/gcc/defaults.h b/gcc/defaults.h index f94ae17..80a798f +100644 +--- a/gcc/defaults.h b/gcc/defaults.h +@@ -438,6 +438,11 @@ see
Re: [OE-core] [PATCH] gcc: upgrade to 4.9.2 and fix the bug #6824
Hi Jacob, Martin I think I brought back the old version things about the sysroot. I’m sorry. It should be the following: EXTRA_OECONF_PATHS = \ --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ --with-sysroot=/not/exist \ --with-build-sysroot=${STAGING_DIR_TARGET} \ From: Jacob Kroon [mailto:jacob.kr...@gmail.com] Sent: Monday, January 12, 2015 5:11 PM To: Lei, Maohui/雷 茂慧 Cc: openembedded-core Subject: Re: [OE-core] [PATCH] gcc: upgrade to 4.9.2 and fix the bug #6824 Hi, On Mon, Jan 12, 2015 at 4:12 AM, Lei Maohui leimao...@cn.fujitsu.commailto:leimao...@cn.fujitsu.com wrote: snip EXTRA_OECONF_PATHS = \ ---with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ ---with-sysroot=/not/exist \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ +--with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ Unless things have changed, the sysroot is supposed to be poisoned by default, see commit 04b725511a505c582a3abdf63d096967f0320779 in OE-Core. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc: upgrade to 4.9.2 and fix the bug #6824
Hi Peter As gcc is (IMO) one of the most critical components of Yocto I think we need to be very clear about what changes are being made to it and why. Yes ,It does. In addition to missing SOB lines, these patches at a minimum should reference the upstream bug that they supposedly patch. That would be https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63908 I got it. Ideally, the patch would be taken from upstream, being created by git-format-patch with the SHA1 of the relevant change as retrieved from: git://gcc.gnu.org/git/gcc.git Yes, but the patches created by git-format-patch from upstream can't be applied to 4.9 branch directly. I tried to backport the patches to 4.9.1 for minimum patch, But I failed. It worries me that these patches, though present in upstream trunk, have not been back-ported to gcc-4_9-branch. There may be a reason for that, and the fact backports have not (yet) been done should be noted in the OE patch header. It does make sense. I hope these patches can be backported to gcc-4_9-branch by gcc member. But I didn't get the answer from gcc Bugzilla. I think the https://bugzilla.yoctoproject.org/show_bug.cgi?id=6824 is a a serious bug. So I did it by myself. :) Cheers, Lei -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Peter A. Bigot Sent: Monday, January 12, 2015 8:38 PM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] gcc: upgrade to 4.9.2 and fix the bug #6824 On 01/11/2015 09:12 PM, Lei Maohui wrote: fix the yocto bug #6824 backport from gcc Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/recipes-devtools/gcc/gcc-4.9.inc | 12 +- ...e500-double-in-SPE_SIMD_REGNO_P-registers.patch | 13 ++ .../0061-Fix-for-unwinder-aborts-on-e500.patch | 161 + 3 files changed, 180 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE_SIMD_ REGNO_P-registers.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0061-Fix-for-unwinder-aborts-on-e500 .patch diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 2568e99..c4ec40d 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -2,11 +2,11 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = 4.9.1 +PV = 4.9.2 # BINV should be incremented to a revision after a minor gcc release -BINV = 4.9.1 +BINV = 4.9.2 FILESEXTRAPATHS =. ${FILE_DIRNAME}/gcc-4.9: @@ -69,11 +69,11 @@ SRC_URI = \ file://0051-eabispe.patch \ file://0053-gcc-fix-segfault-from-calling-free-on-non-malloc-d-a.patch \ file://0054-gcc-Makefile.in-fix-parallel-building-failure.patch \ -file://0055-PR-rtl-optimization-61801.patch \ file://0056-top-level-reorder_gcc-bug-61144.patch \ -file://0057-aarch64-config.patch \ file://0058-gcc-r212171.patch \ file://0059-gcc-PR-rtl-optimization-63348.patch \ + file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \ +file://0061-Fix-for-unwinder-aborts-on-e500.patch \ SRC_URI[md5sum] = fddf71348546af523353bd43d34919c1 SRC_URI[sha256sum] = d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e @@ -125,8 +125,8 @@ EXTRA_OECONF_INTERMEDIATE = \ EXTRA_OECONF_append_libc-uclibc = --disable-decimal-float EXTRA_OECONF_PATHS = \ ---with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \ ---with-sysroot=/not/exist \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BIN V} \ +--with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE _SIMD_REGNO_P-registers.patch b/meta/recipes-devtools/gcc/gcc-4.9/0060-Only-allow-e500-double-in-SPE _SIMD_REGNO_P-registers.patch As gcc is (IMO) one of the most critical components of Yocto I think we need to be very clear about what changes are being made to it and why. In addition to missing SOB lines, these patches at a minimum should reference the upstream bug that they supposedly patch. That would be https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63908 Ideally, the patch would be taken from upstream, being created by git-format-patch with the SHA1 of the relevant change as retrieved from: git://gcc.gnu.org/git/gcc.git It worries me that these patches, though present in upstream trunk, have not been back-ported to gcc-4_9-branch. There may be a reason for that, and the fact backports have not (yet) been done should be noted in the OE patch header. This first patch is apparently upstream commit
[OE-core] [PATCH] xkeyboard-config: modified the license
Because usr/share/X11/xkb/symbols/eu and usr/share/X11/xkb/symbols/ph are GPLv3. So add GPLv3 in the license. Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.bb index 5536b62..7df25c4 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.bb @@ -9,7 +9,7 @@ systems. HOMEPAGE = http://freedesktop.org/wiki/Software/XKeyboardConfig; BUGTRACKER = https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config; -LICENSE = MIT MIT-style +LICENSE = MIT MIT-style GPLv3 LIC_FILES_CHKSUM = file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9 SRC_URI=${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2 -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH] libgcrypt: modified the license of dumpsexp.
Because dumpsexp.c is GPLv3. So pick up the dumpsexp and modified license to GPLv3. Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/recipes-support/libgcrypt/libgcrypt.inc | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc index eea67aa..683be78 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt.inc +++ b/meta/recipes-support/libgcrypt/libgcrypt.inc @@ -4,7 +4,11 @@ BUGTRACKER = https://bugs.g10code.com/gnupg/index; SECTION = libs # helper program gcryptrnd and getrandom are under GPL, rest LGPL -LICENSE = GPLv2+ LGPLv2.1+ +LICENSE = GPLv2+ LGPLv2.1+ GPLv3+ +LICENSE_${PN} = LGPLv2.1+ +LICENSE_${PN}-dev = GPLv2+ LGPLv2.1+ +LICENSE_dumpsexp-dev = GPLv3+ + LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff @@ -35,7 +39,10 @@ do_install_append() { install -m 0644 ${B}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/ } -FILES_${PN}-dev += ${bindir}/dumpsexp ${bindir}/hmac256 +PACKAGES =+ dumpsexp-dev + +FILES_${PN}-dev += ${bindir}/hmac256 +FILES_dumpsexp-dev += ${bindir}/dumpsexp ARM_INSTRUCTION_SET = arm -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH] cairo_1.14.2: Modified the license of cairo-trace.
Because the license of cairo-trace is GPLv3(util/cairo-trace/COPYING). So pickup cairo-trace,and modified the license to GPLv3. Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/recipes-graphics/cairo/cairo.inc | 6 +- meta/recipes-graphics/cairo/cairo_1.14.2.bb | 10 -- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index cd37559..98add5a 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -9,7 +9,11 @@ Extension. HOMEPAGE = http://cairographics.org; BUGTRACKER = http://bugs.freedesktop.org; SECTION = libs -LICENSE = MPL-1 LGPLv2.1 +LICENSE = MPL-1 LGPLv2.1 GPLv3+ +LICENSE_${PN} = MPL-1 LGPLv2.1 +LICENSE_${PN}-dev = MPL-1 LGPLv2.1 +LICENSE_${PN}-gobject = MPL-1 LGPLv2.1 +LICENSE_${PN}-perf-utils = GPLv3+ X11DEPENDS = virtual/libx11 libsm libxrender libxext DEPENDS = libpng fontconfig pixman glib-2.0 zlib diff --git a/meta/recipes-graphics/cairo/cairo_1.14.2.bb b/meta/recipes-graphics/cairo/cairo_1.14.2.bb index 3272eb3..3817dbf 100644 --- a/meta/recipes-graphics/cairo/cairo_1.14.2.bb +++ b/meta/recipes-graphics/cairo/cairo_1.14.2.bb @@ -29,12 +29,10 @@ to replay rendering. DESCRIPTION_cairo-perf-utils = The Cairo library performance utilities FILES_${PN} = ${libdir}/libcairo.so.* -FILES_${PN}-dev += ${libdir}/cairo/*.la ${libdir}/cairo/*.so -#FILES_${PN}-dbg += ${libdir}/cairo/.debug -#FILES_${PN}-staticdev += ${libdir}/cairo/*.a -FILES_cairo-gobject = ${libdir}/libcairo-gobject.so.* -FILES_cairo-script-interpreter = ${libdir}/libcairo-script-interpreter.so.* -FILES_cairo-perf-utils = ${bindir}/cairo-trace ${libdir}/cairo/libcairo-trace.so.* +FILES_${PN}-dev += ${libdir}/cairo/*.so +FILES_${PN}-gobject = ${libdir}/libcairo-gobject.so.* +FILES_${PN}-script-interpreter = ${libdir}/libcairo-script-interpreter.so.* +FILES_${PN}-perf-utils = ${bindir}/cairo-trace ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.* do_install_append () { rm -rf ${D}${bindir}/cairo-sphinx -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cracklib:Fix an error in the patch
To fix an error in the patch.Otherwise,the dictionary would be wrong. Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- ...c-support-dictionary-byte-order-dependent.patch | 67 -- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch index 8e0f406..adbe7df 100644 --- a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch +++ b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch @@ -1,7 +1,7 @@ -From dae29a98c066bc67bb5ba12219d5fd68a8675514 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia hongxu@windriver.com -Date: Fri, 26 Apr 2013 20:44:10 +0800 -Subject: [PATCH] packlib.c: support dictionary byte-order dependent +From 8a6e43726ad0ae41bd1cc2c248d91deb31459357 Mon Sep 17 00:00:00 2001 +From: Lei Maohui leimao...@cn.fujitsu.com +Date: Tue, 9 Jun 2015 11:11:48 +0900 +Subject: [PATCH] packlib.c: support dictionary byte order dependent The previous dict files are NOT byte-order independent, in fact they are probably ARCHITECTURE SPECIFIC. @@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia hongxu@windriver.com Upstream-Status: Pending We can't use the endian.h, htobe* and be*toh functions because they are -not available on older versions of glibc, such as that found in RHEL +not available on older versions of glibc, such as that found in RHEL 5.9. Change to checking endian and directly calling bswap_* as defined in @@ -20,14 +20,15 @@ byteswap.h. Signed-off-by: Mark Hatle mark.ha...@windriver.com +Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- - lib/packlib.c | 208 +++-- - 1 file changed, 204 insertions(+), 4 deletions(-) + lib/packlib.c | 214 -- + 1 file changed, 210 insertions(+), 4 deletions(-) -Index: cracklib-2.8.22/lib/packlib.c -=== cracklib-2.8.22.orig/lib/packlib.c -+++ cracklib-2.8.22/lib/packlib.c +diff --git a/lib/packlib.c b/lib/packlib.c +index f851424..3aac805 100644 +--- a/lib/packlib.c b/lib/packlib.c @@ -16,6 +16,12 @@ #ifdef HAVE_STDINT_H #include stdint.h @@ -41,7 +42,7 @@ Index: cracklib-2.8.22/lib/packlib.c #include packer.h static const char vers_id[] = packlib.c : v2.3p2 Alec Muffett 18 May 1993; -@@ -45,6 +51,182 @@ typedef struct +@@ -45,6 +51,185 @@ typedef struct char data_get[NUMWORDS][MAXWORDLEN]; } PWDICT64; @@ -145,7 +146,8 @@ Index: cracklib-2.8.22/lib/packlib.c + +for (i = 0; i nLen / sizeof(uint64_t); i++) +{ -+*pHwms64++ = bswap_64(*pHwms64); ++*pHwms64 = bswap_64(*pHwms64); ++*pHwms64++; +} + +} @@ -155,7 +157,8 @@ Index: cracklib-2.8.22/lib/packlib.c + +for (i = 0; i nLen / sizeof(uint32_t); i++) +{ -+*pHwms32++ = bswap_32(*pHwms32); ++*pHwms32 = bswap_32(*pHwms32); ++*pHwms32++; +} + +} @@ -199,7 +202,8 @@ Index: cracklib-2.8.22/lib/packlib.c + +for (i = 0; i nLen / sizeof(uint32_t); i++) +{ -+*pHwms32++ = bswap_32(*pHwms32); ++*pHwms32 = bswap_32(*pHwms32); ++*pHwms32++; +} + +} @@ -224,7 +228,7 @@ Index: cracklib-2.8.22/lib/packlib.c static int _PWIsBroken64(FILE *ifp) -@@ -57,6 +239,7 @@ _PWIsBroken64(FILE *ifp) +@@ -57,6 +242,7 @@ _PWIsBroken64(FILE *ifp) return 0; } @@ -232,7 +236,7 @@ Index: cracklib-2.8.22/lib/packlib.c return (pdesc64.header.pih_magic == PIH_MAGIC); } -@@ -149,7 +332,11 @@ PWOpen(prefix, mode) +@@ -149,7 +335,11 @@ PWOpen(prefix, mode) pdesc.header.pih_blocklen = NUMWORDS; pdesc.header.pih_numwords = 0; @@ -245,23 +249,23 @@ Index: cracklib-2.8.22/lib/packlib.c } else { pdesc.flags = ~PFOR_WRITE; -@@ -173,6 +360,7 @@ PWOpen(prefix, mode) - return ((PWDICT *) 0); +@@ -173,6 +363,7 @@ PWOpen(prefix, mode) + return NULL; } +IheaderBigEndianToHost((char *) pdesc.header, en_is32); if ((pdesc.header.pih_magic == 0) || (pdesc.header.pih_numwords == 0)) { /* uh-oh. either a broken 64-bit file or a garbage file. */ -@@ -195,6 +383,7 @@ PWOpen(prefix, mode) +@@ -195,6 +386,7 @@ PWOpen(prefix, mode) } - return ((PWDICT *) 0); + return NULL; } +IheaderBigEndianToHost((char *) pdesc64.header, en_is64); if (pdesc64.header.pih_magic != PIH_MAGIC) { /* nope, not 64-bit after all */ -@@ -290,6 +479,7 @@ PWOpen(prefix, mode
[OE-core] [PATCH v3 1/2] licenses.conf: Modified parameters for new spdx.bbclass
1) Define new command line to get spdx file. 2) Define some mandatory fields for spdx 0.2 Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/conf/licenses.conf | 77 + 1 file changed, 20 insertions(+), 57 deletions(-) diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 629916b..1d37616 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -122,68 +122,31 @@ SPDXLICENSEMAP[SGIv1] = SGI-1 #COPY_LIC_DIRS = 1 ## SPDX temporary directory -SPDX_TEMP_DIR = ${WORKDIR}/spdx_temp -SPDX_MANIFEST_DIR = /home/yocto/fossology_scans +SPDX_TEMP_DIR ?= ${WORKDIR}/spdx_temp +SPDX_MANIFEST_DIR ?= /home/yocto/fossology_scans ## SPDX Format info -SPDX_VERSION = SPDX-1.1 +SPDX_VERSION = SPDX-1.2 DATA_LICENSE = CC0-1.0 +## If your fossylogy server is from 2.4.0 to 2.6.1,the LICENSELISTVERSION is 1.19 +## Reference to http://www.fossology.org/projects/fossology/wiki/Release_Notes +LICENSELISTVERSION = 1.19 +CREATOR_TOOL = yocto+fossology-spdx + +# FOSSologySPDX instance server. +FOSS_SERVER ?= http://127.0.0.1/repo/ --noproxy 127.0.0.1 + +# The following commnd is suit for the FOSSologySPDX instance server in localhost. +# options: +# 1) noCopyright: true/false. Only when this option is set to true, copyright information is scanned. +# 2) jsonOutput: true/false. Only when this option is set to true, scanning result is output in JSON format. +#Skipping this option equals setting to false. +# 3) fullSPDXFlag: true/false. Only when this option is set to true, low definition of full SPDX contents are output. +#This option should be set as true when user want to generate SPDX file from command line. -## Fossology scan information -# You can set option to control if the copyright information will be skipped -# during the identification process. -# -# It is defined as [FOSS_COPYRIGHT] in ./meta/conf/licenses.conf. -# FOSS_COPYRIGHT = true -# NO copyright will be processed. That means only license information will be -# identified and output to SPDX file -# FOSS_COPYRIGHT = false -# Copyright will be identified and output to SPDX file along with license -# information. The process will take more time than not processing copyright -# information. -# - -FOSS_NO_COPYRIGHT = true - -# A option defined as[FOSS_RECURSIVE_UNPACK] in ./meta/conf/licenses.conf. is -# used to control if FOSSology server need recursively unpack tar.gz file which -# is sent from do_spdx task. -# -# FOSS_RECURSIVE_UNPACK = false: -#FOSSology server does NOT recursively unpack. In the current release, this -#is the default choice because recursively unpack will not necessarily break -#down original compressed files. -# FOSS_RECURSIVE_UNPACK = true: -#FOSSology server recursively unpack components. -# - -FOSS_RECURSIVE_UNPACK = false - -# An option defined as [FOSS_FULL_SPDX] in ./meta/conf/licenses.conf is used to -# control what kind of SPDX output to get from the FOSSology server. -# -# FOSS_FULL_SPDX = true: -# Tell FOSSology server to return full SPDX output, like if the program was -# run from the command line. This is needed in order to get license refs for -# the full package rather than individual files only. -# -# FOSS_FULL_SPDX = false: -# Tell FOSSology to only process license information for files. All package -# license tags in the report will be NOASSERTION -# - -FOSS_FULL_SPDX = true - -# FOSSologySPDX instance server. http://localhost/repo is the default -# installation location for FOSSology. -# # For more information on FOSSologySPDX commandline: -# https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API -# - -FOSS_BASE_URL = http://localhost/repo/?mod=spdx_license_once; -FOSS_SERVER = ${FOSS_BASE_URL}fullSPDXFlag=${FOSS_FULL_SPDX}noCopyright=${FOSS_NO_COPYRIGHT}recursiveUnpack=${FOSS_RECURSIVE_UNPACK} +# # https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API -FOSS_WGET_FLAGS = -qO - --no-check-certificate --timeout=0 +FOSS_CURL_FLAGS ?= -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 0/2] These patches aim to make the spdx file be compliant with the SPDX 1.2 Specification.
Those patches aim to make the spdx file be compliant with the SPDX 1.2 Specification. If you want to use this feature,you need to do: 1. Make sure your fossology+spdx server works well.You can get spdx file with the following command. curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@xxx.tar.gz -o xxx.spdx 2. Add the following INHERIT statement and set the SPDX_MANIFEST_DIR at the end of your conf/local.conf file found in the Build Directory. SPDX_MANIFEST_DIR = /xxx/xxx/xxx INHERIT += spdx Lei Maohui (2): licenses.conf: Modified parameters for new spdx.bbclass spdx.bbclass: Create the spdx file which is compliant with SPDX 1.2 Specification meta/classes/spdx.bbclass | 425 +- meta/conf/licenses.conf | 77 +++-- 2 files changed, 175 insertions(+), 327 deletions(-) -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/2] spdx.bbclass: Create the spdx file which is compliant with SPDX 1.2 Specification
The main changes are: 1. use curl command instead of wget when get spdx file from FOSSologySPDX instance server. Before apply these patches, the command is : wget -qO - --no-check-certificate --timeout=0 --post-file=xxx/yyy/zzz.tar.gz http://localhost//?mod=spdx_license_oncenoCopyright=${FOSS_COPYRIGHT}recursiveUnpack=${FOSS_RECURSIVE_UNPACK} After apply these patches, the command is : curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@ xxx/yyy/zzz.tar.gz -o xxx/yyy/zzz.spdx Because if use wget command,the Mandatory fields of the SPDX Specification such as the following can't be obtained. 1) PackageLicenseInfoFromFiles(Package Information) 2) PackageLicenseDeclared(Package Information) 3) LicenseID(License Information) 4) ExtractedText(License Information) 5) LicenseName(License Information) 2. In order to avoid the SPDX_S be polluted in the rebuild, create ${WORKDIR}/${SPDX_TEMP_DIR} to save the source. 3. Add mandatory field to be compliant with the SPDX 1.2 Specification. Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/classes/spdx.bbclass | 425 +- 1 file changed, 155 insertions(+), 270 deletions(-) diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index 454c53e..09584af 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -15,178 +15,191 @@ # SPDX file will be output to the path which is defined as[SPDX_MANIFEST_DIR] # in ./meta/conf/licenses.conf. +SPDXOUTPUTDIR = ${WORKDIR}/spdx_output_dir SPDXSSTATEDIR = ${WORKDIR}/spdx_sstate_dir # If ${S} isn't actually the top-level source directory, set SPDX_S to point at # the real top-level directory. + SPDX_S ?= ${S} python do_spdx () { import os, sys -import json, shutil +import json + +#The source of gcc is too large to get it's spdx.So,give up. +bpn = d.getVar('BPN', True) +if ((bpn == gcc) or (bpn == libgcc)): +return None info = {} info['workdir'] = d.getVar('WORKDIR', True) -info['sourcedir'] = d.getVar('SPDX_S', True) info['pn'] = d.getVar('PN', True) info['pv'] = d.getVar('PV', True) +info['package_download_location'] = d.getVar('SRC_URI', True) +if info['package_download_location'] != : +info['package_download_location'] = info['package_download_location'].split()[0] info['spdx_version'] = d.getVar('SPDX_VERSION', True) info['data_license'] = d.getVar('DATA_LICENSE', True) +info['creator'] = {} +info['creator']['Tool'] = d.getVar('CREATOR_TOOL', True) +info['license_list_version'] = d.getVar('LICENSELISTVERSION', True) +info['package_homepage'] = d.getVar('HOMEPAGE', True) +info['package_summary'] = d.getVar('SUMMARY', True) -sstatedir = d.getVar('SPDXSSTATEDIR', True) -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + .spdx) - +spdx_sstate_dir = d.getVar('SPDXSSTATEDIR', True) manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) -info['outfile'] = os.path.join(manifest_dir, info['pn'] + .spdx ) - -info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) -info['tar_file'] = os.path.join(info['workdir'], info['pn'] + .tar.gz ) - +info['outfile'] = os.path.join(manifest_dir, info['pn'] + - + info['pv'] + .spdx) +sstatefile = os.path.join(spdx_sstate_dir, +info['pn'] + - + info['pv'] + .spdx ) +info['tar_file'] = os.path.join(info['workdir'], info['pn'] + .tar.gz) + # Make sure important dirs exist try: bb.utils.mkdirhier(manifest_dir) -bb.utils.mkdirhier(sstatedir) -bb.utils.mkdirhier(info['spdx_temp_dir']) +bb.utils.mkdirhier(spdx_sstate_dir) except OSError as e: bb.error(SPDX: Could not set up required directories: + str(e)) return ## get everything from cache. use it to decide if -## something needs to be rerun -cur_ver_code = get_ver_code(info['sourcedir']) +## something needs to be rerun +d.setVar('WORKDIR', d.getVar('SPDX_TEMP_DIR', True)) +info['sourcedir'] = d.getVar('SPDX_S', True) +cur_ver_code = get_ver_code(info['sourcedir']).split()[0] cache_cur = False if os.path.exists(sstatefile): ## cache for this package exists. read it in cached_spdx = get_cached_spdx(sstatefile) - -if cached_spdx['PackageVerificationCode'] == cur_ver_code: -bb.warn(SPDX: Verification code for + info['pn'] - + is same as cache's. do nothing) +if cached_spdx: +cached_spdx = cached_spdx.split()[0] +if (cached_spdx == cur_ver_code): +bb.warn(info['pn'] + 's ver code same as cache's. do nothing) cache_cur = True -else: -local_file_info = setup_foss_scan(info, True, cached_spdx['Files']) -else
[OE-core] [PATCH v4 2/3] spdx.bbclass: Create the spdx file which is compliant with SPDX 1.2 Specification
The main changes are: 1. use curl command instead of wget when get spdx file from FOSSologySPDX instance server. Before apply these patches, the command is : wget -qO - --no-check-certificate --timeout=0 --post-file=xxx/yyy/zzz.tar.gz http://localhost//?mod=spdx_license_oncenoCopyright=${FOSS_COPYRIGHT}recursiveUnpack=${FOSS_RECURSIVE_UNPACK} After apply these patches, the command is : curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@ xxx/yyy/zzz.tar.gz -o xxx/yyy/zzz.spdx Because if use wget command,the Mandatory fields of the SPDX Specification such as the following can't be obtained. 1) PackageLicenseInfoFromFiles(Package Information) 2) PackageLicenseDeclared(Package Information) 3) LicenseID(License Information) 4) ExtractedText(License Information) 5) LicenseName(License Information) 2. Add mandatory field to be compliant with the SPDX 1.2 Specification. Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/classes/spdx.bbclass | 399 +++--- 1 file changed, 127 insertions(+), 272 deletions(-) diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index 454c53e..c0f42ad 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -15,178 +15,161 @@ # SPDX file will be output to the path which is defined as[SPDX_MANIFEST_DIR] # in ./meta/conf/licenses.conf. +SPDXOUTPUTDIR = ${WORKDIR}/spdx_output_dir SPDXSSTATEDIR = ${WORKDIR}/spdx_sstate_dir # If ${S} isn't actually the top-level source directory, set SPDX_S to point at # the real top-level directory. + SPDX_S ?= ${S} python do_spdx () { import os, sys -import json, shutil +import json + +#The source of gcc is too large to get it's spdx.So,give up. +bpn = d.getVar('BPN', True) +if ((bpn == gcc) or (bpn == libgcc)): +return None info = {} info['workdir'] = d.getVar('WORKDIR', True) -info['sourcedir'] = d.getVar('SPDX_S', True) info['pn'] = d.getVar('PN', True) info['pv'] = d.getVar('PV', True) +info['package_download_location'] = d.getVar('SRC_URI', True) +if info['package_download_location'] != : +info['package_download_location'] = info['package_download_location'].split()[0] info['spdx_version'] = d.getVar('SPDX_VERSION', True) -info['data_license'] = d.getVar('DATA_LICENSE', True) - -sstatedir = d.getVar('SPDXSSTATEDIR', True) -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + .spdx) - +info['data_license'] = d.getVar('SPDX_DATA_LICENSE', True) +info['creator'] = {} +info['creator']['Tool'] = d.getVar('SPDX_CREATOR_TOOL', True) +info['license_list_version'] = d.getVar('SPDX_LICENSELISTVERSION', True) +info['package_homepage'] = d.getVar('HOMEPAGE', True) +info['package_summary'] = d.getVar('SUMMARY', True) + +spdx_sstate_dir = d.getVar('SPDXSSTATEDIR', True) manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) -info['outfile'] = os.path.join(manifest_dir, info['pn'] + .spdx ) - -info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) -info['tar_file'] = os.path.join(info['workdir'], info['pn'] + .tar.gz ) - +info['outfile'] = os.path.join(manifest_dir, info['pn'] + - + info['pv'] + .spdx) +sstatefile = os.path.join(spdx_sstate_dir, +info['pn'] + - + info['pv'] + .spdx ) +info['tar_file'] = os.path.join(info['workdir'], info['pn'] + .tar.gz) + # Make sure important dirs exist try: bb.utils.mkdirhier(manifest_dir) -bb.utils.mkdirhier(sstatedir) -bb.utils.mkdirhier(info['spdx_temp_dir']) +bb.utils.mkdirhier(spdx_sstate_dir) except OSError as e: bb.error(SPDX: Could not set up required directories: + str(e)) return ## get everything from cache. use it to decide if -## something needs to be rerun -cur_ver_code = get_ver_code(info['sourcedir']) +## something needs to be rerun +info['sourcedir'] = d.getVar('SPDX_S', True) +cur_ver_code = get_ver_code(info['sourcedir']).split()[0] cache_cur = False if os.path.exists(sstatefile): ## cache for this package exists. read it in cached_spdx = get_cached_spdx(sstatefile) - -if cached_spdx['PackageVerificationCode'] == cur_ver_code: -bb.warn(SPDX: Verification code for + info['pn'] - + is same as cache's. do nothing) +if cached_spdx: +cached_spdx = cached_spdx.split()[0] +if (cached_spdx == cur_ver_code): +bb.warn(info['pn'] + 's ver code same as cache's. do nothing) cache_cur = True -else: -local_file_info = setup_foss_scan(info, True, cached_spdx['Files']) -else: -local_file_info = setup_foss_scan(info, False, None) - -if cache_cur: -spdx_file_info = cached_spdx
[OE-core] [PATCH v4 3/3] spdx: create a directory to save source code
In order to avoid the SPDX_S be polluted in the rebuild, create ${WORKDIR}/${SPDX_TEMP_DIR} to save the source. Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/classes/spdx.bbclass | 34 +- meta/conf/licenses.conf | 2 ++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index c0f42ad..5421ae1 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -64,6 +64,7 @@ python do_spdx () { ## get everything from cache. use it to decide if ## something needs to be rerun +d.setVar('WORKDIR', d.getVar('SPDX_TEMP_DIR', True)) info['sourcedir'] = d.getVar('SPDX_S', True) cur_ver_code = get_ver_code(info['sourcedir']).split()[0] cache_cur = False @@ -94,8 +95,39 @@ python do_spdx () { bb.warn('Can\'t get the spdx file ' + info['pn'] + '. Please check your fossylogy server.') if os.path.exists(info['tar_file']): remove_file(info['tar_file']) +d.setVar('WORKDIR', info['workdir']) } -addtask spdx after do_patch before do_configure +#Get the src after do_patch. +python do_get_spdx_s() { +import shutil +#The source of gcc is too large to get it's spdx.So,give up. +bpn = d.getVar('BPN', True) +if ((bpn == gcc) or (bpn == libgcc)): +return None +# Change the WORKDIR to make do_unpack do_patch run in another dir. +d.setVar('WORKDIR', d.getVar('SPDX_TEMP_DIR', True)) +# The changed 'WORKDIR' also casued 'B' changed, create dir 'B' for the +# possibly requiring of the following tasks (such as some recipes's +# do_patch required 'B' existed). +bb.utils.mkdirhier(d.getVar('B', True)) + +# The kernel source is ready after do_validate_branches +if bb.data.inherits_class('kernel-yocto', d): +kernel_workdir = d.getVar('WORKDIR', True) + /kernel-source +if os.path.exists(kernel_workdir): +bb.utils.remove(kernel_workdir) +shutil.copytree(d.getVar('S', True), kernel_workdir, symlinks=True) +return None +else: +bb.build.exec_func('do_unpack', d) +# The S of the gcc source is work-share +if ((bpn == gcc) or (bpn == libgcc)): +d.setVar('S', d.getVar('WORKDIR', True) + /gcc- + d.getVar('PV', True)) +bb.build.exec_func('do_patch', d) +} + +addtask get_spdx_s after do_patch before do_configure +addtask spdx after do_get_spdx_s before do_configure def create_manifest(info,sstatefile): import shutil diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index be7602e..9e6856e 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -121,6 +121,8 @@ SPDXLICENSEMAP[SGIv1] = SGI-1 # both COPY_LIC_MANIFEST and COPY_LIC_DIRS #COPY_LIC_DIRS = 1 +## SPDX temporary directory +SPDX_TEMP_DIR ?= ${WORKDIR}/spdx_temp ## SPDX manifest directory SPDX_MANIFEST_DIR ?= ${TMPDIR}/fossology_scans -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 0/3] These patches aim to make the spdx file be compliant with the SPDX 1.2 Specification.
Those patches aim to make the spdx file be compliant with the SPDX 1.2 Specification. If you want to use this feature,you need to do: 1. Make sure your fossology+spdx server works well.You can get spdx file with the following command. curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@xxx.tar.gz -o xxx.spdx 2. Add the following INHERIT statement and set the SPDX_MANIFEST_DIR at the end of your conf/local.conf file found in the Build Directory. INHERIT += spdx Lei Maohui (3): licenses.conf: Modified parameters for new spdx.bbclass spdx.bbclass: Create the spdx file which is compliant with SPDX 1.2 Specification spdx: create a directory to save source code meta/classes/spdx.bbclass | 431 +- meta/conf/licenses.conf | 86 +++-- 2 files changed, 184 insertions(+), 333 deletions(-) -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 1/3] licenses.conf: Modified parameters for new spdx.bbclass
1) Define new command line to get spdx file. 2) Define some mandatory fields for spdx 1.2 Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/conf/licenses.conf | 86 ++--- 1 file changed, 24 insertions(+), 62 deletions(-) diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 629916b..be7602e 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -121,69 +121,31 @@ SPDXLICENSEMAP[SGIv1] = SGI-1 # both COPY_LIC_MANIFEST and COPY_LIC_DIRS #COPY_LIC_DIRS = 1 -## SPDX temporary directory -SPDX_TEMP_DIR = ${WORKDIR}/spdx_temp -SPDX_MANIFEST_DIR = /home/yocto/fossology_scans +## SPDX manifest directory +SPDX_MANIFEST_DIR ?= ${TMPDIR}/fossology_scans ## SPDX Format info -SPDX_VERSION = SPDX-1.1 -DATA_LICENSE = CC0-1.0 - -## Fossology scan information -# You can set option to control if the copyright information will be skipped -# during the identification process. -# -# It is defined as [FOSS_COPYRIGHT] in ./meta/conf/licenses.conf. -# FOSS_COPYRIGHT = true -# NO copyright will be processed. That means only license information will be -# identified and output to SPDX file -# FOSS_COPYRIGHT = false -# Copyright will be identified and output to SPDX file along with license -# information. The process will take more time than not processing copyright -# information. -# - -FOSS_NO_COPYRIGHT = true - -# A option defined as[FOSS_RECURSIVE_UNPACK] in ./meta/conf/licenses.conf. is -# used to control if FOSSology server need recursively unpack tar.gz file which -# is sent from do_spdx task. -# -# FOSS_RECURSIVE_UNPACK = false: -#FOSSology server does NOT recursively unpack. In the current release, this -#is the default choice because recursively unpack will not necessarily break -#down original compressed files. -# FOSS_RECURSIVE_UNPACK = true: -#FOSSology server recursively unpack components. -# - -FOSS_RECURSIVE_UNPACK = false - -# An option defined as [FOSS_FULL_SPDX] in ./meta/conf/licenses.conf is used to -# control what kind of SPDX output to get from the FOSSology server. -# -# FOSS_FULL_SPDX = true: -# Tell FOSSology server to return full SPDX output, like if the program was -# run from the command line. This is needed in order to get license refs for -# the full package rather than individual files only. -# -# FOSS_FULL_SPDX = false: -# Tell FOSSology to only process license information for files. All package -# license tags in the report will be NOASSERTION -# - -FOSS_FULL_SPDX = true - -# FOSSologySPDX instance server. http://localhost/repo is the default -# installation location for FOSSology. -# -# For more information on FOSSologySPDX commandline: -# https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API -# - -FOSS_BASE_URL = http://localhost/repo/?mod=spdx_license_once; -FOSS_SERVER = ${FOSS_BASE_URL}fullSPDXFlag=${FOSS_FULL_SPDX}noCopyright=${FOSS_NO_COPYRIGHT}recursiveUnpack=${FOSS_RECURSIVE_UNPACK} - -FOSS_WGET_FLAGS = -qO - --no-check-certificate --timeout=0 +SPDX_VERSION = SPDX-1.2 +SPDX_DATA_LICENSE = CC0-1.0 +## If your fossylogy server is from 2.4.0 to 2.6.1,the LICENSELISTVERSION is 1.19 +## Reference to http://www.fossology.org/projects/fossology/wiki/Release_Notes +SPDX_LICENSELISTVERSION = 1.19 +SPDX_CREATOR_TOOL = yocto+fossology-spdx + +## FOSSologySPDX instance server. +FOSS_SERVER ?= http://127.0.0.1/repo/ --noproxy 127.0.0.1 + +## The following commnd is suit for the FOSSologySPDX instance server in localhost. +## options: +## 1) noCopyright: true/false. Only when this option is set to true, copyright information is scanned. +## 2) jsonOutput: true/false. Only when this option is set to true, scanning result is output in JSON format. +## Skipping this option equals setting to false. +## 3) fullSPDXFlag: true/false. Only when this option is set to true, low definition of full SPDX contents are output. +## This option should be set as true when user want to generate SPDX file from command line. + +## For more information on FOSSologySPDX commandline: +## https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API + +FOSS_CURL_FLAGS ?= -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 0/3] These patches aim to make the spdx file be compliant with the SPDX 1.2 Specification.
ping -Original Message- From: Lei, Maohui Sent: Wednesday, June 10, 2015 6:09 PM To: openembedded-core@lists.openembedded.org Cc: Lei, Maohui Subject: [PATCH v4 0/3] These patches aim to make the spdx file be compliant with the SPDX 1.2 Specification. Those patches aim to make the spdx file be compliant with the SPDX 1.2 Specification. If you want to use this feature,you need to do: 1. Make sure your fossology+spdx server works well.You can get spdx file with the following command. curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@xxx.tar.gz -o xxx.spdx 2. Add the following INHERIT statement and set the SPDX_MANIFEST_DIR at the end of your conf/local.conf file found in the Build Directory. INHERIT += spdx Lei Maohui (3): licenses.conf: Modified parameters for new spdx.bbclass spdx.bbclass: Create the spdx file which is compliant with SPDX 1.2 Specification spdx: create a directory to save source code meta/classes/spdx.bbclass | 431 +- meta/conf/licenses.conf | 86 +++-- 2 files changed, 184 insertions(+), 333 deletions(-) -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/2] These patches aim to make the spdx file be compliant with the SPDX 1.2 Specification.
Those patches aim to make the spdx file be compliant with the SPDX 1.2 Specification. If you want to use this feature,you need to do: 1. Make sure your fossology+spdx server works well.You can get spdx file with the following command. curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@xxx.tar.gz -o xxx.spdx 2. Add the following INHERIT statement and set the SPDX_MANIFEST_DIR at the end of your conf/local.conf file found in the Build Directory. SPDX_MANIFEST_DIR = /xxx/xxx/xxx INHERIT += spdx Lei Maohui (2): Create the spdx file which is compliant with SPDX 1.2 Specification licenses.conf:Modified parameters for new spdx.bbclass meta/classes/spdx.bbclass | 425 +- meta/conf/licenses.conf | 65 ++- 2 files changed, 169 insertions(+), 321 deletions(-) -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/2] spdx.bbclass: Create the spdx file which is compliant with SPDX 1.2 Specification
The main changes are: 1. use curl command instead of wget when get spdx file from FOSSologySPDX instance server. Before apply these patches, the command is : wget -qO - --no-check-certificate --timeout=0 --post-file=xxx/yyy/zzz.tar.gz http://localhost//?mod=spdx_license_oncenoCopyright=${FOSS_COPYRIGHT}recursiveUnpack=${FOSS_RECURSIVE_UNPACK} After apply these patches, the command is : curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@ xxx/yyy/zzz.tar.gz -o xxx/yyy/zzz.spdx Because if use wget command,the Mandatory fields of the SPDX Specification such as the following can't be obtained. 1) PackageLicenseInfoFromFiles(Package Information) 2) PackageLicenseDeclared(Package Information) 3) LicenseID(License Information) 4) ExtractedText(License Information) 5) LicenseName(License Information) 2. In order to avoid the SPDX_S be polluted in the rebuild, create ${WORKDIR}/${SPDX_TEMP_DIR} to save the source. 3. Add mandatory field to be compliant with the SPDX 1.2 Specification. Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/classes/spdx.bbclass | 425 +- 1 file changed, 155 insertions(+), 270 deletions(-) diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index 454c53e..09584af 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -15,178 +15,191 @@ # SPDX file will be output to the path which is defined as[SPDX_MANIFEST_DIR] # in ./meta/conf/licenses.conf. +SPDXOUTPUTDIR = ${WORKDIR}/spdx_output_dir SPDXSSTATEDIR = ${WORKDIR}/spdx_sstate_dir # If ${S} isn't actually the top-level source directory, set SPDX_S to point at # the real top-level directory. + SPDX_S ?= ${S} python do_spdx () { import os, sys -import json, shutil +import json + +#The source of gcc is too large to get it's spdx.So,give up. +bpn = d.getVar('BPN', True) +if ((bpn == gcc) or (bpn == libgcc)): +return None info = {} info['workdir'] = d.getVar('WORKDIR', True) -info['sourcedir'] = d.getVar('SPDX_S', True) info['pn'] = d.getVar('PN', True) info['pv'] = d.getVar('PV', True) +info['package_download_location'] = d.getVar('SRC_URI', True) +if info['package_download_location'] != : +info['package_download_location'] = info['package_download_location'].split()[0] info['spdx_version'] = d.getVar('SPDX_VERSION', True) info['data_license'] = d.getVar('DATA_LICENSE', True) +info['creator'] = {} +info['creator']['Tool'] = d.getVar('CREATOR_TOOL', True) +info['license_list_version'] = d.getVar('LICENSELISTVERSION', True) +info['package_homepage'] = d.getVar('HOMEPAGE', True) +info['package_summary'] = d.getVar('SUMMARY', True) -sstatedir = d.getVar('SPDXSSTATEDIR', True) -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + .spdx) - +spdx_sstate_dir = d.getVar('SPDXSSTATEDIR', True) manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) -info['outfile'] = os.path.join(manifest_dir, info['pn'] + .spdx ) - -info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) -info['tar_file'] = os.path.join(info['workdir'], info['pn'] + .tar.gz ) - +info['outfile'] = os.path.join(manifest_dir, info['pn'] + - + info['pv'] + .spdx) +sstatefile = os.path.join(spdx_sstate_dir, +info['pn'] + - + info['pv'] + .spdx ) +info['tar_file'] = os.path.join(info['workdir'], info['pn'] + .tar.gz) + # Make sure important dirs exist try: bb.utils.mkdirhier(manifest_dir) -bb.utils.mkdirhier(sstatedir) -bb.utils.mkdirhier(info['spdx_temp_dir']) +bb.utils.mkdirhier(spdx_sstate_dir) except OSError as e: bb.error(SPDX: Could not set up required directories: + str(e)) return ## get everything from cache. use it to decide if -## something needs to be rerun -cur_ver_code = get_ver_code(info['sourcedir']) +## something needs to be rerun +d.setVar('WORKDIR', d.getVar('SPDX_TEMP_DIR', True)) +info['sourcedir'] = d.getVar('SPDX_S', True) +cur_ver_code = get_ver_code(info['sourcedir']).split()[0] cache_cur = False if os.path.exists(sstatefile): ## cache for this package exists. read it in cached_spdx = get_cached_spdx(sstatefile) - -if cached_spdx['PackageVerificationCode'] == cur_ver_code: -bb.warn(SPDX: Verification code for + info['pn'] - + is same as cache's. do nothing) +if cached_spdx: +cached_spdx = cached_spdx.split()[0] +if (cached_spdx == cur_ver_code): +bb.warn(info['pn'] + 's ver code same as cache's. do nothing) cache_cur = True -else: -local_file_info = setup_foss_scan(info, True, cached_spdx['Files']) -else
[OE-core] [PATCH v2 2/2] licenses.conf:Modified parameters for new spdx.bbclass
Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/conf/licenses.conf | 65 +++-- 1 file changed, 14 insertions(+), 51 deletions(-) diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 629916b..b732451 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -115,75 +115,38 @@ SPDXLICENSEMAP[SGIv1] = SGI-1 # LICENSE_PATH += ${COREBASE}/custom-licenses # Set if you want the license.manifest copied to the image -#COPY_LIC_MANIFEST = 1 +COPY_LIC_MANIFEST = 1 # If you want the pkg licenses copied over as well you must set # both COPY_LIC_MANIFEST and COPY_LIC_DIRS -#COPY_LIC_DIRS = 1 +COPY_LIC_DIRS = 1 ## SPDX temporary directory -SPDX_TEMP_DIR = ${WORKDIR}/spdx_temp -SPDX_MANIFEST_DIR = /home/yocto/fossology_scans +SPDX_TEMP_DIR ?= ${WORKDIR}/spdx_temp +SPDX_MANIFEST_DIR ?= /home/yocto/fossology_scans ## SPDX Format info -SPDX_VERSION = SPDX-1.1 +SPDX_VERSION = SPDX-1.2 DATA_LICENSE = CC0-1.0 +## If your fossylogy server is from 2.4.0 to 2.6.1,the LICENSELISTVERSION is 1.19 +## Reference to http://www.fossology.org/projects/fossology/wiki/Release_Notes +LICENSELISTVERSION = 1.19 +CREATOR_TOOL = yocto+fossology-spdx ## Fossology scan information # You can set option to control if the copyright information will be skipped # during the identification process. # # It is defined as [FOSS_COPYRIGHT] in ./meta/conf/licenses.conf. -# FOSS_COPYRIGHT = true -# NO copyright will be processed. That means only license information will be -# identified and output to SPDX file -# FOSS_COPYRIGHT = false -# Copyright will be identified and output to SPDX file along with license -# information. The process will take more time than not processing copyright -# information. -# - -FOSS_NO_COPYRIGHT = true -# A option defined as[FOSS_RECURSIVE_UNPACK] in ./meta/conf/licenses.conf. is -# used to control if FOSSology server need recursively unpack tar.gz file which -# is sent from do_spdx task. -# -# FOSS_RECURSIVE_UNPACK = false: -#FOSSology server does NOT recursively unpack. In the current release, this -#is the default choice because recursively unpack will not necessarily break -#down original compressed files. -# FOSS_RECURSIVE_UNPACK = true: -#FOSSology server recursively unpack components. -# - -FOSS_RECURSIVE_UNPACK = false - -# An option defined as [FOSS_FULL_SPDX] in ./meta/conf/licenses.conf is used to -# control what kind of SPDX output to get from the FOSSology server. -# -# FOSS_FULL_SPDX = true: -# Tell FOSSology server to return full SPDX output, like if the program was -# run from the command line. This is needed in order to get license refs for -# the full package rather than individual files only. -# -# FOSS_FULL_SPDX = false: -# Tell FOSSology to only process license information for files. All package -# license tags in the report will be NOASSERTION -# - -FOSS_FULL_SPDX = true - -# FOSSologySPDX instance server. http://localhost/repo is the default -# installation location for FOSSology. -# +# FOSSologySPDX instance server. # For more information on FOSSologySPDX commandline: # https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API -# +# -FOSS_BASE_URL = http://localhost/repo/?mod=spdx_license_once; -FOSS_SERVER = ${FOSS_BASE_URL}fullSPDXFlag=${FOSS_FULL_SPDX}noCopyright=${FOSS_NO_COPYRIGHT}recursiveUnpack=${FOSS_RECURSIVE_UNPACK} +# The following commnd is suit for the FOSSologySPDX instance server in localhost. -FOSS_WGET_FLAGS = -qO - --no-check-certificate --timeout=0 +FOSS_SERVER ?= http://127.0.0.1/repo/ --noproxy 127.0.0.1 +FOSS_CURL_FLAGS ?= -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 2/2] licenses.conf:Modified parameters for new spdx.bbclass
Hi Richard +COPY_LIC_MANIFEST = 1 Did you mean to change these defaults? Sorry,it's my fault.This option is for license.bbclass, should not be modified. ## Fossology scan information # You can set option to control if the copyright information will be skipped # during the identification process. # # It is defined as [FOSS_COPYRIGHT] in ./meta/conf/licenses.conf. You've left this comment in but removed all the example variables? I will modified this comment for new FOSS_CURL_FLAGS variables. -FOSS_RECURSIVE_UNPACK = false This is another removed option. Why? -FOSS_FULL_SPDX = true and more removed functionality? +FOSS_SERVER ?= http://127.0.0.1/repo/ --noproxy 127.0.0.1 +FOSS_CURL_FLAGS ?= -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true This appears to hardcode some things which used to be configurable? I think it's no need to make yocto users know every option of FOSSology-spdx command line. It is a good user experience that user can get a full spdx file only to add INHERIT += spdx . So I use the whole fossology-spdx suggests command line (https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API ) instead of make every option configurable. Cheers Lei -Original Message- From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] Sent: Friday, May 29, 2015 7:12 PM To: Lei, Maohui Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH v2 2/2] licenses.conf:Modified parameters for new spdx.bbclass On Fri, 2015-05-29 at 17:45 +0800, Lei Maohui wrote: There is no longer description of the changes here which makes it very hard to decide if you intended to change some of the things below. They don't all look to be related to the new class. Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- meta/conf/licenses.conf | 65 +++-- 1 file changed, 14 insertions(+), 51 deletions(-) diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index 629916b..b732451 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -115,75 +115,38 @@ SPDXLICENSEMAP[SGIv1] = SGI-1 # LICENSE_PATH += ${COREBASE}/custom-licenses # Set if you want the license.manifest copied to the image -#COPY_LIC_MANIFEST = 1 +COPY_LIC_MANIFEST = 1 Did you mean to change these defaults? # If you want the pkg licenses copied over as well you must set # both COPY_LIC_MANIFEST and COPY_LIC_DIRS -#COPY_LIC_DIRS = 1 +COPY_LIC_DIRS = 1 ## SPDX temporary directory -SPDX_TEMP_DIR = ${WORKDIR}/spdx_temp -SPDX_MANIFEST_DIR = /home/yocto/fossology_scans +SPDX_TEMP_DIR ?= ${WORKDIR}/spdx_temp +SPDX_MANIFEST_DIR ?= /home/yocto/fossology_scans ## SPDX Format info -SPDX_VERSION = SPDX-1.1 +SPDX_VERSION = SPDX-1.2 DATA_LICENSE = CC0-1.0 +## If your fossylogy server is from 2.4.0 to 2.6.1,the +LICENSELISTVERSION is 1.19 ## Reference to +http://www.fossology.org/projects/fossology/wiki/Release_Notes +LICENSELISTVERSION = 1.19 +CREATOR_TOOL = yocto+fossology-spdx ## Fossology scan information # You can set option to control if the copyright information will be skipped # during the identification process. # # It is defined as [FOSS_COPYRIGHT] in ./meta/conf/licenses.conf. You've left this comment in but removed all the example variables? -# FOSS_COPYRIGHT = true -# NO copyright will be processed. That means only license information will be -# identified and output to SPDX file -# FOSS_COPYRIGHT = false -# Copyright will be identified and output to SPDX file along with license -# information. The process will take more time than not processing copyright -# information. -# - -FOSS_NO_COPYRIGHT = true -# A option defined as[FOSS_RECURSIVE_UNPACK] in ./meta/conf/licenses.conf. is -# used to control if FOSSology server need recursively unpack tar.gz file which -# is sent from do_spdx task. -# -# FOSS_RECURSIVE_UNPACK = false: -#FOSSology server does NOT recursively unpack. In the current release, this -#is the default choice because recursively unpack will not necessarily break -#down original compressed files. -# FOSS_RECURSIVE_UNPACK = true: -#FOSSology server recursively unpack components. -# - -FOSS_RECURSIVE_UNPACK = false This is another removed option. Why? -# An option defined as [FOSS_FULL_SPDX] in ./meta/conf/licenses.conf is used to -# control what kind of SPDX output to get from the FOSSology server. -# -# FOSS_FULL_SPDX = true: -# Tell FOSSology server to return full SPDX output, like if the program was -# run from the command line. This is needed in order to get license refs for -# the full package rather than individual files only. -# -# FOSS_FULL_SPDX = false: -# Tell FOSSology to only process license
[OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
Hello, Can non-GPLv3 parted be added into oe-core? I think not everybody wants to use the GPLv3 version. Cheers Lei -Original Message- From: openembedded-devel-boun...@lists.openembedded.org [mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf Of Andre McCurdy Sent: Tuesday, July 07, 2015 6:23 AM To: openembedded-de...@lists.openembedded.org Subject: Re: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3 On Sun, Jul 5, 2015 at 6:51 PM, Lei Maohui leimao...@cn.fujitsu.com wrote: In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3. Thanks, it's good to have a non-GPLv3 recipe for parted. However, if the GPLv3 recipe is in oe-core then the non-GPLv3 version should be in oe-core as well, not in in meta-oe. The reason is that recipes in meta-oe have a higher priority (BBFILE_PRIORITY == 6) than those in oe-core (BBFILE_PRIORITY == 5). Therefore if you add a parted recipe to meta-oe then it will be used by default, which will be wrong for anyone who wants to continue to use the GPLv3 version in oe-core. http://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#var-BBFILE_ PRIORITY Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11 .../1001parted-1.8.6-notransname1.patch| 39 ++ .../1002parted-1.8.6-off-by-one1.patch | 25 + .../1003parted-1.8.6-primary-boundary1.patch | 12 + .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 + .../1005parted-1.8.6-devmapper-header1.patch | 13 + .../parted/parted-1.8.6/7000no_effect_macro1.patch | 11 .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 + meta-oe/recipes-extended/parted/parted_1.8.6.bb| 62 ++ 9 files changed, 249 insertions(+) create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings 1.patch create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransn ame1.patch create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-o ne1.patch create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary- boundary1.patch create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.pat ch create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmappe r-header1.patch create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patc h create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patc h create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnin gs1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnin gs1.patch new file mode 100644 index 000..c8b2e7d --- /dev/null +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-wa +++ rnings1.patch @@ -0,0 +1,11 @@ +--- parted-1.8.6/libparted/fs/linux_swap/linux_swap.c.warnings +2007-03-20 13:22:36.0 -0400 parted-1.8.6/libparted/fs/linux_swap/linux_swap.c 2007-03-20 13:59:11.0 -0400 +@@ -123,7 +123,7 @@ + + error_close_fs: + swap_close (fs); +-error: ++ + return 0; + } + #endif /* !DISCOVER_ONLY */ diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notran sname1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notran sname1.patch new file mode 100644 index 000..5fdf10b --- /dev/null +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-no +++ transname1.patch @@ -0,0 +1,39 @@ +--- parted-1.8.6/parted/parted.c.notransname 2007-03-13 13:01:09.0 -0400 parted-1.8.6/parted/parted.c 2007-03-21 10:50:35.0 -0400 +@@ -1429,7 +1429,7 @@ + part-fs_type-name : +); + + if (has_name) { +-name = _(ped_partition_get_name (part)); ++name = ped_partition_get_name ++ (part); + str_list_append (row, name); + } + +--- parted-1.8.6/parted/table.c.notransname2007-03-13 13:01:09.0 -0400 parted-1.8.6/parted/table.c2007-03-21 10:51:31.0 -0400 +@@ -191,7 +191,8 @@ + len += wcslen(COLSUFFIX); + + newsize = (wcslen(*s) + len + 1) * sizeof(wchar_t); +-*s = realloc (*s, newsize); ++*s = (wchar_t *) realloc (*s, newsize); ++assert(*s != NULL); + + for (i = 0; i ncols; ++i) + { +@@ -199,6
Re: [OE-core] glibc 2.22
Hi Khem, glibc 2.22 will release end of this month. For some time I have put together the update here http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/m asterid=0 2e73ea526d94f21c7ef82eb96b062eff8ebb825 It works pretty well for machines I have tested it on ( arm/x86 ) but would be interested if more wider trial could be carried out and issues reported between now and release can be addressed. Please give it a try if you have spare cycles I tested it on powerpc(e500v2),and did a ltp test. It does work well. Best Regards Lei Maohui -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Khem Raj Sent: Tuesday, July 14, 2015 1:37 AM To: Patches and discussions about the oe-core layer; OpenEmbedded Devel List; Yocto discussion list Subject: [OE-core] glibc 2.22 Hi All glibc 2.22 will release end of this month. For some time I have put together the update here http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/m asterid=0 2e73ea526d94f21c7ef82eb96b062eff8ebb825 It works pretty well for machines I have tested it on ( arm/x86 ) but would be interested if more wider trial could be carried out and issues reported between now and release can be addressed. Please give it a try if you have spare cycles Thanks -Khem -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 0/3] These patches aim to make the spdx file be compliant with the SPDX 1.2 Specification.
Hi all In the Open Compliance Summit of 2015(http://events.linuxfoundation.org/events/open-compliance-summit), I noticed that a lot of people are interested in SPDX. According to my understanding, there are some tools have supported SPDX 2.0. But Yocto+spdx still supports SPDX 1.1. In the next version of poky, are there some plans about Yocto+spdx? Best Regards Lei > -Original Message- > From: Lei, Maohui > Sent: Wednesday, June 10, 2015 6:09 PM > To: openembedded-core@lists.openembedded.org > Cc: Lei, Maohui > Subject: [PATCH v4 0/3] These patches aim to make the spdx file be compliant > with the > SPDX 1.2 Specification. > > Those patches aim to make the spdx file be compliant with the SPDX 1.2 > Specification. > If you want to use this feature,you need to do: > 1. Make sure your fossology+spdx server works well.You can get spdx file with > the > following command. >curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F > mod=spdx_license_once -F > noCopyright=false >-F jsonOutput=false -F fullSPDXFlag=true -F file=@xxx.tar.gz -o xxx.spdx > > 2. Add the following INHERIT statement and set the SPDX_MANIFEST_DIR at the > end > of your conf/local.conf file found in the Build Directory. >INHERIT += "spdx" > > > Lei Maohui (3): > licenses.conf: Modified parameters for new spdx.bbclass > spdx.bbclass: Create the spdx file which is compliant with SPDX > 1.2 Specification > spdx: create a directory to save source code > > meta/classes/spdx.bbclass | 431 > +- > meta/conf/licenses.conf | 86 +++-- > 2 files changed, 184 insertions(+), 333 deletions(-) > > -- > 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
Hi Otavio Who's going to provide ongoing maintenance for all that? I would like Lei to establish himself as the maintainer (through the maintainers.inc file). Agreed; 2007 I was still one of developers of it IIRC and since then, Jim has improved it quite a lot. Thank you. To be honest, parted at that time has several issues with bigger disk sectors and other stuff. I wouldn't like to see projects relying on such old and buggy version. Old version does have some issues. But I think it is better to provide a non-v3 version to user who does not mind of these issues. Cheers Lei -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Otavio Salvador Sent: Tuesday, July 07, 2015 10:00 PM To: Alexander Kanavin Cc: OE-core Subject: Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3 On Tue, Jul 7, 2015 at 10:55 AM, Alexander Kanavin alexander.kana...@linux.intel.com wrote: On 07/07/2015 04:38 PM, Burton, Ross wrote: How about renaming the recipe, so that it doesn't clash with the GPLv3 version? For example, parted1_1.8.6.bb http://parted1_1.8.6.bb. Then it can be kept outside of oe-core. As they're just version variations that would be overly complex. Dropping it in oe-core as it's a non-v3 alternative doesn't seem to be a problem to me (as there's plenty of precedent for that already). My problem is that parted 1.8.6 was released in 2007, and the recipe already carries eight patches with it (and none of them has any information about their origin). Who's going to provide ongoing maintenance for all that? I would like Lei to establish himself as the maintainer (through the maintainers.inc file). Agreed; 2007 I was still one of developers of it IIRC and since then, Jim has improved it quite a lot. To be honest, parted at that time has several issues with bigger disk sectors and other stuff. I wouldn't like to see projects relying on such old and buggy version. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
Hi Ross There's a good argument for this, so send a tested patch and it can be reviewed. OK. I will add some comments in the eight patches of recipe, and send the patch later. Cheers Lei From: Burton, Ross [mailto:ross.bur...@intel.com] Sent: Tuesday, July 07, 2015 4:19 PM To: Lei, Maohui/雷 茂慧 Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3 On 7 July 2015 at 04:50, Lei, Maohui leimao...@cn.fujitsu.commailto:leimao...@cn.fujitsu.com wrote: Can non-GPLv3 parted be added into oe-core? I think not everybody wants to use the GPLv3 version. There's a good argument for this, so send a tested patch and it can be reviewed. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] parted_1.8.6.bb: add parted that not GPLv3
Hi Alex +do_install_append() { + /bin/rm -rf ${D}/${libdir}/*.la + /bin/rm -rf ${D}/usr/share/info/dir + /bin/rm -fr ${D}/usr/bin +} Reference to fedora and Ubuntu, I delete these files. Cheers Lei -Original Message- From: alexander.kana...@linux.intel.com [mailto:alexander.kana...@linux.intel.com] Sent: Thursday, July 09, 2015 7:33 PM To: Lei, Maohui Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] parted_1.8.6.bb: add parted that not GPLv3 Add parted-1.8.6 which is not GPLv3. I have to say, I still can't support having this in oe-core. Providing alternatives to GPLv3 software is fine, but not when the 'alternative' is a very old, unsupported version of the same software, which inevitably brings issues in functionality and maintenance. But if Ross and/or Richard disagree, then I'll have to accept it. +Upstream-Status: Pending Inappropriate is a better reason here, with clarification that the patches are to make an old version work and upstream won't be interested in them. +do_install_append() { + /bin/rm -rf ${D}/${libdir}/*.la + /bin/rm -rf ${D}/usr/share/info/dir + /bin/rm -fr ${D}/usr/bin +} What are you deleting here and why? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 0/3] These patches aim to make the spdx file be compliant with the SPDX 1.2 Specification.
Hi Why not accept this improvement ? I met someone was interested in it. Cheers Lei -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui Sent: Friday, June 19, 2015 1:14 PM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH v4 0/3] These patches aim to make the spdx file be compliant with the SPDX 1.2 Specification. ping -Original Message- From: Lei, Maohui Sent: Wednesday, June 10, 2015 6:09 PM To: openembedded-core@lists.openembedded.org Cc: Lei, Maohui Subject: [PATCH v4 0/3] These patches aim to make the spdx file be compliant with the SPDX 1.2 Specification. Those patches aim to make the spdx file be compliant with the SPDX 1.2 Specification. If you want to use this feature,you need to do: 1. Make sure your fossology+spdx server works well.You can get spdx file with the following command. curl http://127.0.0.1/repo/ --noproxy 127.0.0.1 -k -F mod=spdx_license_once -F noCopyright=false -F jsonOutput=false -F fullSPDXFlag=true -F file=@xxx.tar.gz -o xxx.spdx 2. Add the following INHERIT statement and set the SPDX_MANIFEST_DIR at the end of your conf/local.conf file found in the Build Directory. INHERIT += spdx Lei Maohui (3): licenses.conf: Modified parameters for new spdx.bbclass spdx.bbclass: Create the spdx file which is compliant with SPDX 1.2 Specification spdx: create a directory to save source code meta/classes/spdx.bbclass | 431 +- meta/conf/licenses.conf | 86 +++-- 2 files changed, 184 insertions(+), 333 deletions(-) -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
Hi Alex Who's going to provide ongoing maintenance for all that? I would like Lei to establish himself as the maintainer (through the maintainers.inc file). Thank you. I'm very glad to do that. Cheers Lei -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Alexander Kanavin Sent: Tuesday, July 07, 2015 9:56 PM To: Burton, Ross Cc: OE-core Subject: Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3 On 07/07/2015 04:38 PM, Burton, Ross wrote: How about renaming the recipe, so that it doesn't clash with the GPLv3 version? For example, parted1_1.8.6.bb http://parted1_1.8.6.bb. Then it can be kept outside of oe-core. As they're just version variations that would be overly complex. Dropping it in oe-core as it's a non-v3 alternative doesn't seem to be a problem to me (as there's plenty of precedent for that already). My problem is that parted 1.8.6 was released in 2007, and the recipe already carries eight patches with it (and none of them has any information about their origin). Who's going to provide ongoing maintenance for all that? I would like Lei to establish himself as the maintainer (through the maintainers.inc file). Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] parted_1.8.6.bb: add parted that not GPLv3
Add parted-1.8.6 which is not GPLv3. Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com --- .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 17 ++ .../1001parted-1.8.6-notransname1.patch| 45 .../1002parted-1.8.6-off-by-one1.patch | 31 +++ .../1003parted-1.8.6-primary-boundary1.patch | 18 +++ .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 56 .../1005parted-1.8.6-devmapper-header1.patch | 19 +++ .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 29 ++ meta/recipes-extended/parted/parted_1.8.6.bb | 61 ++ 8 files changed, 276 insertions(+) create mode 100644 meta/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch create mode 100644 meta/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch create mode 100644 meta/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch create mode 100644 meta/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch create mode 100644 meta/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch create mode 100644 meta/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch create mode 100644 meta/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch create mode 100644 meta/recipes-extended/parted/parted_1.8.6.bb diff --git a/meta/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch b/meta/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch new file mode 100644 index 000..83455ee --- /dev/null +++ b/meta/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch @@ -0,0 +1,17 @@ +This patch comes from: http://pkgs.fedoraproject.org/cgit/parted.git/commit/?id=ce690b23703eb5295d116cdb972a04260ef5ddec + +Upstream-Status: Pending + +Signed-off-by: Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com + +--- parted-1.8.6/libparted/fs/linux_swap/linux_swap.c.warnings 2007-03-20 13:22:36.0 -0400 parted-1.8.6/libparted/fs/linux_swap/linux_swap.c 2007-03-20 13:59:11.0 -0400 +@@ -123,7 +123,7 @@ + + error_close_fs: + swap_close (fs); +-error: ++ + return 0; + } + #endif /* !DISCOVER_ONLY */ diff --git a/meta/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch b/meta/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch new file mode 100644 index 000..7fbfde7 --- /dev/null +++ b/meta/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch @@ -0,0 +1,45 @@ +This patch comes from: http://pkgs.fedoraproject.org/cgit/parted.git/commit/?id=e13022c01a2cd944e28c61827c96b0a37f4eecf0 + +Upstream-Status: Pending + +Signed-off-by: Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com + +--- parted-1.8.6/parted/parted.c.notransname 2007-03-13 13:01:09.0 -0400 parted-1.8.6/parted/parted.c 2007-03-21 10:50:35.0 -0400 +@@ -1429,7 +1429,7 @@ + part-fs_type-name : ); + + if (has_name) { +-name = _(ped_partition_get_name (part)); ++name = ped_partition_get_name (part); + str_list_append (row, name); + } + +--- parted-1.8.6/parted/table.c.notransname2007-03-13 13:01:09.0 -0400 parted-1.8.6/parted/table.c2007-03-21 10:51:31.0 -0400 +@@ -191,7 +191,8 @@ + len += wcslen(COLSUFFIX); + + newsize = (wcslen(*s) + len + 1) * sizeof(wchar_t); +-*s = realloc (*s, newsize); ++*s = (wchar_t *) realloc (*s, newsize); ++assert(*s != NULL); + + for (i = 0; i ncols; ++i) + { +@@ -199,6 +200,7 @@ + int nspaces = max(t-widths[i] - wcswidth(row[i], MAX_WIDTH), + 0); + wchar_t* pad = malloc ( (nspaces + 1) * sizeof(wchar_t) ); ++assert(pad != NULL); + + for (j = 0; j nspaces; ++j) +pad[j] = L' '; +@@ -211,6 +213,7 @@ + wcscat (*s, DELIMITER); + + free (pad); ++pad = NULL; + } + + wcscat (*s, COLSUFFIX); diff --git a/meta/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch b/meta/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch new file mode 100644 index 000..dde5c29 --- /dev/null +++ b/meta/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch @@ -0,0 +1,31 @@ +This patch comes from: http://pkgs.fedoraproject.org/cgit/parted.git/commit/?id=cb95a1496c040be5e9de8f674224619fd47648c3 + +Upstream-Status: Pending + +Signed-off-by: Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com + +--- parted-1.8.6/parted
[OE-core] [PATCH] jpeg: To enable non-JPEG file formats for djpeg/cjpeg command.
To fix the error as following when use djpeg/cjpeg command: Unsupported output file format Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com> --- meta/recipes-core/jpeg/jpeg_9a.bb | 13 + 1 file changed, 13 insertions(+) diff --git a/meta/recipes-core/jpeg/jpeg_9a.bb b/meta/recipes-core/jpeg/jpeg_9a.bb index ea2e65d..092057d 100644 --- a/meta/recipes-core/jpeg/jpeg_9a.bb +++ b/meta/recipes-core/jpeg/jpeg_9a.bb @@ -21,6 +21,19 @@ FILES_jpeg-tools = "${bindir}/*" BBCLASSEXTEND = "native" +#To enable non-JPEG(bmp,gif,ppm and targa) file formats for djpeg/cjpeg command +do_compile_prepend() { +echo '#ifdef JPEG_CJPEG_DJPEG ' >> jconfig.h +echo '#define BMP_SUPPORTED/* BMP image file format */' >> jconfig.h +echo '#define GIF_SUPPORTED/* GIF image file format */' >> jconfig.h +echo '#define PPM_SUPPORTED/* PBMPLUS PPM/PGM image file format */' >> jconfig.h +echo '#undef RLE_SUPPORTED /* Utah RLE image file format */' >> jconfig.h +echo '#define TARGA_SUPPORTED /* Targa image file format */' >> jconfig.h +echo '#endif /* JPEG_CJPEG_DJPEG */' >> jconfig.h +} + + + pkg_postinst_${PN}_linuxstdbase () { if [ ! -e $D${libdir}/libjpeg.so.62 ]; then JPEG=`find $D${libdir} -type f -name libjpeg.so.\*.\*.\*` -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] jpeg: To enable non-JPEG file formats for djpeg/cjpeg command.
Hi Ross & Robert > oe-core is about to move to libjpeg-turbo (see ross/mut and the recent > patches), so this will need to be retested and rebased if required. OK. I got it. Thanks . Hi Robert Can this patch be merged into YP 2.0 branch? Best regards lei From: Burton, Ross [mailto:ross.bur...@intel.com] Sent: Tuesday, January 05, 2016 1:02 AM To: Lei, Maohui Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] jpeg: To enable non-JPEG file formats for djpeg/cjpeg command. Hi, oe-core is about to move to libjpeg-turbo (see ross/mut and the recent patches), so this will need to be retested and rebased if required. Ross On 30 December 2015 at 01:07, Lei, Maohui <leimao...@cn.fujitsu.com<mailto:leimao...@cn.fujitsu.com>> wrote: ping > -Original Message- > From: Lei, Maohui > Sent: Friday, December 18, 2015 5:08 PM > To: > openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> > Cc: Lei, Maohui > Subject: [OE-core][PATCH] jpeg: To enable non-JPEG file formats for > djpeg/cjpeg > command. > > To fix the error as following when use djpeg/cjpeg command: > Unsupported output file format > > Signed-off-by: Lei Maohui > <leimao...@cn.fujitsu.com<mailto:leimao...@cn.fujitsu.com>> > --- > meta/recipes-core/jpeg/jpeg_9a.bb<http://jpeg_9a.bb> | 13 + > 1 file changed, 13 insertions(+) > > diff --git a/meta/recipes-core/jpeg/jpeg_9a.bb<http://jpeg_9a.bb> > b/meta/recipes- > core/jpeg/jpeg_9a.bb<http://jpeg_9a.bb> > index ea2e65d..092057d 100644 > --- a/meta/recipes-core/jpeg/jpeg_9a.bb<http://jpeg_9a.bb> > +++ b/meta/recipes-core/jpeg/jpeg_9a.bb<http://jpeg_9a.bb> > @@ -21,6 +21,19 @@ FILES_jpeg-tools = "${bindir}/*" > > BBCLASSEXTEND = "native" > > +#To enable non-JPEG(bmp,gif,ppm and targa) file formats for djpeg/cjpeg > command > +do_compile_prepend() { > +echo '#ifdef JPEG_CJPEG_DJPEG ' >> > jconfig.h > +echo '#define BMP_SUPPORTED/* BMP image file format */' >> > jconfig.h > +echo '#define GIF_SUPPORTED/* GIF image file format */' >> > jconfig.h > +echo '#define PPM_SUPPORTED/* PBMPLUS PPM/PGM image file format > */' >> jconfig.h > +echo '#undef RLE_SUPPORTED /* Utah RLE image file format */' >> > jconfig.h > +echo '#define TARGA_SUPPORTED /* Targa image file format */' >> > jconfig.h > +echo '#endif /* JPEG_CJPEG_DJPEG */' >> > jconfig.h > +} > + > + > + > pkg_postinst_${PN}_linuxstdbase () { > if [ ! -e $D${libdir}/libjpeg.so.62 ]; then > JPEG=`find $D${libdir} -type f -name libjpeg.so.\*.\*.\*` > -- > 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org> http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] jpeg: To enable non-JPEG file formats for djpeg/cjpeg command.
ping > -Original Message- > From: Lei, Maohui > Sent: Friday, December 18, 2015 5:08 PM > To: openembedded-core@lists.openembedded.org > Cc: Lei, Maohui > Subject: [OE-core][PATCH] jpeg: To enable non-JPEG file formats for > djpeg/cjpeg > command. > > To fix the error as following when use djpeg/cjpeg command: > Unsupported output file format > > Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com> > --- > meta/recipes-core/jpeg/jpeg_9a.bb | 13 + > 1 file changed, 13 insertions(+) > > diff --git a/meta/recipes-core/jpeg/jpeg_9a.bb b/meta/recipes- > core/jpeg/jpeg_9a.bb > index ea2e65d..092057d 100644 > --- a/meta/recipes-core/jpeg/jpeg_9a.bb > +++ b/meta/recipes-core/jpeg/jpeg_9a.bb > @@ -21,6 +21,19 @@ FILES_jpeg-tools = "${bindir}/*" > > BBCLASSEXTEND = "native" > > +#To enable non-JPEG(bmp,gif,ppm and targa) file formats for djpeg/cjpeg > command > +do_compile_prepend() { > +echo '#ifdef JPEG_CJPEG_DJPEG ' >> > jconfig.h > +echo '#define BMP_SUPPORTED/* BMP image file format */' >> > jconfig.h > +echo '#define GIF_SUPPORTED/* GIF image file format */' >> > jconfig.h > +echo '#define PPM_SUPPORTED/* PBMPLUS PPM/PGM image file format > */' >> jconfig.h > +echo '#undef RLE_SUPPORTED /* Utah RLE image file format */' >> > jconfig.h > +echo '#define TARGA_SUPPORTED /* Targa image file format */' >> > jconfig.h > +echo '#endif /* JPEG_CJPEG_DJPEG */' >> > jconfig.h > +} > + > + > + > pkg_postinst_${PN}_linuxstdbase () { > if [ ! -e $D${libdir}/libjpeg.so.62 ]; then > JPEG=`find $D${libdir} -type f -name libjpeg.so.\*.\*.\*` > -- > 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] To make yocto-spdx support spdx2.0 SPEC
Ping. > -Original Message- > From: Lei, Maohui > Sent: Monday, June 27, 2016 8:12 AM > To: openembedded-core@lists.openembedded.org > Cc: Lei, Maohui > Subject: [OE-core][PATCH] To make yocto-spdx support spdx2.0 SPEC > > There are some problems in spdx module(spdx.bbclass). > 1. The newest version of spdxi specification is 2.0. But even spdx 1.1, > yocto+SPDX can't support well. > 2. It is complex to build a Yocto+SPDX environment. > 3. Creating a spdx file spends too much time, especially for large > software. > > To improve spdx module ,I change the spdx create tool from fossology to > dosocs2. > With this patch: > 1. Also gets license informations by scanner from fossology. > 1. Can support SPDX2.0 SPEC. > 2. Because dosocs2 can work on directories, so there is no necessary to > pack source code before do_spdx. It can save time for large software. > > Lei Maohui (1): > To Make yocto-spdx support spdx v2.0 specification. > > meta/classes/spdx.bbclass | 488 +- > > meta/conf/licenses.conf | 67 +-- > 2 files changed, 184 insertions(+), 371 deletions(-) > > -- > 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] To make yocto-spdx support spdx2.0 SPEC
There are some problems in spdx module(spdx.bbclass). 1. The newest version of spdxi specification is 2.0. But even spdx 1.1, yocto+SPDX can't support well. 2. It is complex to build a Yocto+SPDX environment. 3. Creating a spdx file spends too much time, especially for large software. To improve spdx module ,I change the spdx create tool from fossology to dosocs2. With this patch: 1. Also gets license informations by scanner from fossology. 1. Can support SPDX2.0 SPEC. 2. Because dosocs2 can work on directories, so there is no necessary to pack source code before do_spdx. It can save time for large software. Lei Maohui (1): To Make yocto-spdx support spdx v2.0 specification. meta/classes/spdx.bbclass | 488 +- meta/conf/licenses.conf | 67 +-- 2 files changed, 184 insertions(+), 371 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Made spdx support SPDX2.0 SPEC Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com>
--- meta/classes/spdx.bbclass | 488 +- meta/conf/licenses.conf | 67 +-- 2 files changed, 184 insertions(+), 371 deletions(-) diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index 0c92765..892199d 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -1,12 +1,9 @@ # This class integrates real-time license scanning, generation of SPDX standard # output and verifiying license info during the building process. -# It is a combination of efforts from the OE-Core, SPDX and Fossology projects. +# It is a combination of efforts from the OE-Core, SPDX and DoSOCSv2 projects. # -# For more information on FOSSology: -# http://www.fossology.org -# -# For more information on FOSSologySPDX commandline: -# https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API +# For more information on DoSOCSv2: +# https://github.com/DoSOCSv2 # # For more information on SPDX: # http://www.spdx.org @@ -15,351 +12,230 @@ # SPDX file will be output to the path which is defined as[SPDX_MANIFEST_DIR] # in ./meta/conf/licenses.conf. +SPDXOUTPUTDIR = "${WORKDIR}/spdx_output_dir" SPDXSSTATEDIR = "${WORKDIR}/spdx_sstate_dir" # If ${S} isn't actually the top-level source directory, set SPDX_S to point at # the real top-level directory. + SPDX_S ?= "${S}" python do_spdx () { import os, sys -import json, shutil - -info = {} -info['workdir'] = d.getVar('WORKDIR', True) -info['sourcedir'] = d.getVar('SPDX_S', True) -info['pn'] = d.getVar('PN', True) -info['pv'] = d.getVar('PV', True) -info['spdx_version'] = d.getVar('SPDX_VERSION', True) -info['data_license'] = d.getVar('DATA_LICENSE', True) - -sstatedir = d.getVar('SPDXSSTATEDIR', True) -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + ".spdx") +import json -manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) -info['outfile'] = os.path.join(manifest_dir, info['pn'] + ".spdx" ) +if d.getVar('PN', True) == d.getVar('BPN', True) + "-native": +return None -info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) -info['tar_file'] = os.path.join(info['workdir'], info['pn'] + ".tar.gz" ) +if 'gcc' in d.getVar('PN', True): +return None -# Make sure important dirs exist -try: -bb.utils.mkdirhier(manifest_dir) -bb.utils.mkdirhier(sstatedir) -bb.utils.mkdirhier(info['spdx_temp_dir']) -except OSError as e: -bb.error("SPDX: Could not set up required directories: " + str(e)) -return +info = {} +info['workdir'] = (d.getVar('WORKDIR', True) or "") +info['pn'] = (d.getVar( 'PN', True ) or "") +info['pv'] = (d.getVar( 'PV', True ) or "") +info['package_download_location'] = (d.getVar( 'SRC_URI', True ) or "") +if info['package_download_location'] != "": +info['package_download_location'] = info['package_download_location'].split()[0] +info['spdx_version'] = (d.getVar('SPDX_VERSION', True) or '') +info['data_license'] = (d.getVar('DATA_LICENSE', True) or '') +info['creator'] = {} +info['creator']['Tool'] = (d.getVar('CREATOR_TOOL', True) or '') +info['license_list_version'] = (d.getVar('LICENSELISTVERSION', True) or '') +info['package_homepage'] = (d.getVar('HOMEPAGE', True) or "") +info['package_summary'] = (d.getVar('SUMMARY', True) or "") +info['package_summary'] = info['package_summary'].replace("\n","") +info['package_summary'] = info['package_summary'].replace("'"," ") + +spdx_sstate_dir = (d.getVar('SPDXSSTATEDIR', True) or "") +manifest_dir = (d.getVar('SPDX_MANIFEST_DIR', True) or "") +info['outfile'] = os.path.join(manifest_dir, info['pn'] + "-" + info['pv'] + ".spdx" ) +sstatefile = os.path.join(spdx_sstate_dir, +info['pn'] + "-" + info['pv'] + ".spdx" ) ## get everything from cache. use it to decide if -## something needs to be rerun -cur_ver_code = get_ver_code(info['sourcedir']) +## something needs to be rerun +if not os.path.exists( spdx_sstate_dir ): +bb.utils.mkdirhier( spdx_sstate_dir ) + +d.setVar('WORKDIR', d.getVar('SPDX_TEMP_DIR', True)) +info['sourcedir'] = (d.getVar('SPDX_S', True) or "") +cur_ver_code = get_ver_code( info['sourcedir'] ).split()[0] cache_cur = False -if os.path.exists(sstatefile): +if os.path.exists( sstatefile ): ## cache for this package exists. read it in -cached_spdx = get_cached_spdx(sstatefile) - -if cached_spdx['PackageVerificationCode'] == cur_ver_code: -bb.warn("SPDX: Verification code for " + info['pn'] - + "is same as cache's. do nothing") +cached_spdx = get_cached_spdx( sstatefile ) +if cached_spdx: +cached_spdx = cached_spdx.split()[0] +if (cached_spdx == cur_ver_code): +bb.warn(info['pn'] + "'s ver code same
Re: [OE-core] [PATCH] To make yocto-spdx support spdx2.0 SPEC
Hi all I want to know if anyone maintains the spdx module(spdx.bbclass)? If nobody is maintaining it, I want to know if I can do it. Best regards Lei > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > Lei, Maohui > Sent: Wednesday, July 20, 2016 10:14 AM > To: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] To make yocto-spdx support spdx2.0 SPEC > > Ping. > > > -----Original Message- > > From: Lei, Maohui > > Sent: Monday, June 27, 2016 8:12 AM > > To: openembedded-core@lists.openembedded.org > > Cc: Lei, Maohui > > Subject: [OE-core][PATCH] To make yocto-spdx support spdx2.0 SPEC > > > > There are some problems in spdx module(spdx.bbclass). > > 1. The newest version of spdxi specification is 2.0. But even spdx > > 1.1, > > yocto+SPDX can't support well. > > 2. It is complex to build a Yocto+SPDX environment. > > 3. Creating a spdx file spends too much time, especially for large > > software. > > > > To improve spdx module ,I change the spdx create tool from fossology > > to dosocs2. > > With this patch: > > 1. Also gets license informations by scanner from fossology. > > 1. Can support SPDX2.0 SPEC. > > 2. Because dosocs2 can work on directories, so there is no necessary > > to pack source code before do_spdx. It can save time for large > software. > > > > Lei Maohui (1): > > To Make yocto-spdx support spdx v2.0 specification. > > > > meta/classes/spdx.bbclass | 488 > > +- > > > > meta/conf/licenses.conf | 67 +-- > > 2 files changed, 184 insertions(+), 371 deletions(-) > > > > -- > > 1.9.1 > > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Made spdx support SPDX2.0 SPEC Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com>
To all > I think DoSOCSv2 is more integratabtle into Yocto/OE infra and seems to be > having, fossology setups are complex and is slow too. so it might be a good > option to have. Yes, it is. In addition, the fossology-spdx isn't maintained any more. To make spdx module easier to use, I have added dosocs2-natives into a new meta: meta-spdxscanner (https://github.com/dl9pf/meta-spdxscanner/tree/leimh-dev ). Better than my patch for oe-core, with meta-spdxscanner, user doesn't need to do anything on host system. Because python-dosocs2-natives depends some recipes come from meta-oe, I think it is hard to add python-dosocs2-natives into oe-core. Maybe it is better to move spdx module into meta-oe? Best regards Lei > -Original Message- > From: Khem Raj [mailto:raj.k...@gmail.com] > Sent: Friday, December 23, 2016 1:28 AM > To: Sona Sarmadi > Cc: Lei, Maohui/雷 茂慧; openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] Made spdx support SPDX2.0 SPEC Signed-off-by: > Lei Maohui <leimao...@cn.fujitsu.com> > > > > On Dec 22, 2016, at 1:07 AM, Sona Sarmadi <sona.sarm...@enea.com> wrote: > > > > Hi Lei, all, > > > >> --- a/meta/classes/spdx.bbclass > >> +++ b/meta/classes/spdx.bbclass > >> @@ -1,12 +1,9 @@ > >> # This class integrates real-time license scanning, generation of > >> SPDX standard # output and verifiying license info during the building > process. > >> -# It is a combination of efforts from the OE-Core, SPDX and > >> Fossology projects. > >> +# It is a combination of efforts from the OE-Core, SPDX and DoSOCSv2 > >> projects. > > > > Why replace Fossology with DoSOCSv2? Why not make it optional? > > > > Has anyone any comments on this suggestion? AFAI see this patch has not been > accepted yet. Is there any plan to do it? > > I think DoSOCSv2 is more integratabtle into Yocto/OE infra and seems to be > having, fossology setups are complex and is slow too. so it might be a good > option to have. > > > > > Cheers > > //Sona > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 SPEC
More: - change spdx tool from fossology to dosocs2 Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com> --- meta/classes/spdx.bbclass | 505 ++ meta/conf/licenses.conf | 67 +- 2 files changed, 198 insertions(+), 374 deletions(-) diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass index 0c92765..27c0fa0 100644 --- a/meta/classes/spdx.bbclass +++ b/meta/classes/spdx.bbclass @@ -1,365 +1,252 @@ # This class integrates real-time license scanning, generation of SPDX standard # output and verifiying license info during the building process. -# It is a combination of efforts from the OE-Core, SPDX and Fossology projects. +# It is a combination of efforts from the OE-Core, SPDX and DoSOCSv2 projects. # -# For more information on FOSSology: -# http://www.fossology.org -# -# For more information on FOSSologySPDX commandline: -# https://github.com/spdx-tools/fossology-spdx/wiki/Fossology-SPDX-Web-API +# For more information on DoSOCSv2: +# https://github.com/DoSOCSv2 # # For more information on SPDX: # http://www.spdx.org # +# Note: +# 1) Make sure DoSOCSv2 has beed installed in your host +# 2) By default,spdx files will be output to the path which is defined as[SPDX_MANIFEST_DIR] +#in ./meta/conf/licenses.conf. -# SPDX file will be output to the path which is defined as[SPDX_MANIFEST_DIR] -# in ./meta/conf/licenses.conf. - +SPDXOUTPUTDIR = "${WORKDIR}/spdx_output_dir" SPDXSSTATEDIR = "${WORKDIR}/spdx_sstate_dir" # If ${S} isn't actually the top-level source directory, set SPDX_S to point at # the real top-level directory. + SPDX_S ?= "${S}" python do_spdx () { import os, sys -import json, shutil - -info = {} -info['workdir'] = d.getVar('WORKDIR', True) -info['sourcedir'] = d.getVar('SPDX_S', True) -info['pn'] = d.getVar('PN', True) -info['pv'] = d.getVar('PV', True) -info['spdx_version'] = d.getVar('SPDX_VERSION', True) -info['data_license'] = d.getVar('DATA_LICENSE', True) - -sstatedir = d.getVar('SPDXSSTATEDIR', True) -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + ".spdx") +import json -manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) -info['outfile'] = os.path.join(manifest_dir, info['pn'] + ".spdx" ) +## It's no necessary to get spdx files for *-native +if d.getVar('PN', True) == d.getVar('BPN', True) + "-native": +return None -info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) -info['tar_file'] = os.path.join(info['workdir'], info['pn'] + ".tar.gz" ) +## gcc is too big to get spdx file. +if 'gcc' in d.getVar('PN', True): +return None -# Make sure important dirs exist -try: -bb.utils.mkdirhier(manifest_dir) -bb.utils.mkdirhier(sstatedir) -bb.utils.mkdirhier(info['spdx_temp_dir']) -except OSError as e: -bb.error("SPDX: Could not set up required directories: " + str(e)) -return +info = {} +info['workdir'] = (d.getVar('WORKDIR', True) or "") +info['pn'] = (d.getVar( 'PN', True ) or "") +info['pv'] = (d.getVar( 'PV', True ) or "") +info['package_download_location'] = (d.getVar( 'SRC_URI', True ) or "") +if info['package_download_location'] != "": +info['package_download_location'] = info['package_download_location'].split()[0] +info['spdx_version'] = (d.getVar('SPDX_VERSION', True) or '') +info['data_license'] = (d.getVar('DATA_LICENSE', True) or '') +info['creator'] = {} +info['creator']['Tool'] = (d.getVar('CREATOR_TOOL', True) or '') +info['license_list_version'] = (d.getVar('LICENSELISTVERSION', True) or '') +info['package_homepage'] = (d.getVar('HOMEPAGE', True) or "") +info['package_summary'] = (d.getVar('SUMMARY', True) or "") +info['package_summary'] = info['package_summary'].replace("\n","") +info['package_summary'] = info['package_summary'].replace("'"," ") + +spdx_sstate_dir = (d.getVar('SPDXSSTATEDIR', True) or "") +manifest_dir = (d.getVar('SPDX_MANIFEST_DIR', True) or "") +info['outfile'] = os.path.join(manifest_dir, info['pn'] + "-" + info['pv'] + ".spdx" ) +sstatefile = os.path.join(spdx_sstate_dir, +info['pn'] + "-" + info['pv'] + ".spdx" ) ## get everything from cache. use it to decide if -## something needs to be rerun -cur_ver_code = get_ver_code(info['sourcedir']) +## something needs to be rerun +if not os.path.exists( spdx_sstate_dir ): +bb.utils.mkdirhier( spdx_sstate_dir ) + +d.setVar('WORKDIR', d.getVar('SPDX_TEMP_DIR', True)) +info['sourcedir'] = (d.getVar('SPDX_S', True) or "") +cur_ver_code = get_ve
[OE-core] [PATCH v2 0/1] To make yocto-spdx support spdx2.0 SPEC
There are some problems in spdx module(spdx.bbclass). 1. The newest version of spdxi specification is 2.0. But even spdx 1.1, yocto+SPDX can't support well. 2. It is complex to build a Yocto+SPDX environment. 3. Creating a spdx file spends too much time, especially for large software. To improve spdx module ,I change the spdx create tool from fossology to dosocs2. With this patch: 1. Also gets license informations by scanner from fossology. 1. Can support SPDX2.0 SPEC. 2. Because dosocs2 can work on directories, so there is no necessary to pack source code before do_spdx. It can save time for large software. Lei Maohui (1): Make yocto-spdx support spdx2.0 SPEC meta/classes/spdx.bbclass | 505 ++ meta/conf/licenses.conf | 67 +- 2 files changed, 198 insertions(+), 374 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 0/1] To make yocto-spdx support spdx2.0 SPEC
Hi all I have updated my patch for newest poky, can someone give me some comments? ^_^ Best regards Lei > -Original Message- > From: Lei, Maohui > Sent: Monday, September 19, 2016 4:40 PM > To: openembedded-core@lists.openembedded.org > Cc: jsmoel...@linuxfoundation.org; Lei, Maohui > Subject: [OE-core][PATCH v2 0/1] To make yocto-spdx support spdx2.0 SPEC > > There are some problems in spdx module(spdx.bbclass). > 1. The newest version of spdx specification is 2.0. But even spdx 1.1, > yocto+SPDX can't support well. > 2. It is complex to build a Yocto+SPDX environment. > 3. Creating a spdx file spends too much time, especially for large software. > > To improve spdx module ,I change the spdx create tool from fossology to > dosocs2. > With this patch: > 1. Also gets license informations by scanner from fossology. > 1. Can support SPDX2.0 SPEC. > 2. Because dosocs2 can work on directories, so there is no necessary to pack > source code before do_spdx. It can save time for large software. > > Lei Maohui (1): > Make yocto-spdx support spdx2.0 SPEC > > meta/classes/spdx.bbclass | 505 > ++ > meta/conf/licenses.conf | 67 +- > 2 files changed, 198 insertions(+), 374 deletions(-) > > -- > 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 SPEC
Hi Maxin, Simon > It would be nice to include the reason for change from fossology to dosocs2 > in the commit message too (from cover letter) OK, I will add the reasons into the commit message in v3. > Instead of requesting the user to install the DoSOCSv2 from github or > other repos, can we make the spdx.bbclass depend on "dosocs-native" or > similar and make that "DoSOCSv2" recipe available in oe-core ? That's a good idea. I will try. Best Regards Lei > -Original Message- > From: Maxin B. John [mailto:maxin.j...@intel.com] > Sent: Monday, September 19, 2016 6:58 PM > To: Lei, Maohui > Cc: openembedded-core@lists.openembedded.org; > jsmoel...@linuxfoundation.org > Subject: Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 > SPEC > > Hi, > > Please find my comments below: > > On Mon, Sep 19, 2016 at 04:39:50PM +0800, Lei Maohui wrote: > > More: > > - change spdx tool from fossology to dosocs2 > > It would be nice to include the reason for change from fossology to > dosocs2 in the commit message too (from cover letter) > > > Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com> > > --- > > meta/classes/spdx.bbclass | 505 ++-- > -- > > meta/conf/licenses.conf | 67 +- > > 2 files changed, 198 insertions(+), 374 deletions(-) > > > > diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass > > index 0c92765..27c0fa0 100644 > > --- a/meta/classes/spdx.bbclass > > +++ b/meta/classes/spdx.bbclass > > @@ -1,365 +1,252 @@ > > # This class integrates real-time license scanning, generation of > > SPDX standard # output and verifiying license info during the > building process. > > -# It is a combination of efforts from the OE-Core, SPDX and > Fossology projects. > > +# It is a combination of efforts from the OE-Core, SPDX and DoSOCSv2 > projects. > > # > > -# For more information on FOSSology: > > -# http://www.fossology.org > > -# > > -# For more information on FOSSologySPDX commandline: > > -# https://github.com/spdx-tools/fossology-spdx/wiki/Fossology- > SPDX-Web-API > > +# For more information on DoSOCSv2: > > +# https://github.com/DoSOCSv2 > > Instead of requesting the user to install the DoSOCSv2 from github or > other repos, can we make the spdx.bbclass depend on "dosocs-native" or > similar and make that "DoSOCSv2" recipe available in oe-core ? > > That might make it easy to use this class. > > > # For more information on SPDX: > > # http://www.spdx.org > > # > > +# Note: > > +# 1) Make sure DoSOCSv2 has beed installed in your host # 2) By > > +default,spdx files will be output to the path which is defined > as[SPDX_MANIFEST_DIR] > > +#in ./meta/conf/licenses.conf. > > > > -# SPDX file will be output to the path which is defined > > as[SPDX_MANIFEST_DIR] -# in ./meta/conf/licenses.conf. > > +SPDXOUTPUTDIR = "${WORKDIR}/spdx_output_dir" > > SPDXSSTATEDIR = "${WORKDIR}/spdx_sstate_dir" > > > > # If ${S} isn't actually the top-level source directory, set SPDX_S > > to point at # the real top-level directory. > > + > > SPDX_S ?= "${S}" > > > > python do_spdx () { > > import os, sys > > -import json, shutil > > - > > -info = {} > > -info['workdir'] = d.getVar('WORKDIR', True) > > -info['sourcedir'] = d.getVar('SPDX_S', True) > > -info['pn'] = d.getVar('PN', True) > > -info['pv'] = d.getVar('PV', True) > > -info['spdx_version'] = d.getVar('SPDX_VERSION', True) > > -info['data_license'] = d.getVar('DATA_LICENSE', True) > > - > > -sstatedir = d.getVar('SPDXSSTATEDIR', True) > > -sstatefile = os.path.join(sstatedir, info['pn'] + info['pv'] + > ".spdx") > > +import json > > > > -manifest_dir = d.getVar('SPDX_MANIFEST_DIR', True) > > -info['outfile'] = os.path.join(manifest_dir, info['pn'] + > ".spdx" ) > > +## It's no necessary to get spdx files for *-native > > +if d.getVar('PN', True) == d.getVar('BPN', True) + "-native": > > +return None > > > > -info['spdx_temp_dir'] = d.getVar('SPDX_TEMP_DIR', True) > > -info['tar_file'] = os.path.join(info['workdir'], info['pn'] + > ".tar.gz" ) > > +## gcc is too big to get spdx file. > > +if 'gcc' in d.getVar('PN', True): > > +return None > > > > -# Make sure important dirs exist > > -try: > >
Re: [OE-core] [PATCH] ltp: 20160126 -> 20160920
Ping. > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > Wang Xin > Sent: Monday, September 26, 2016 4:18 PM > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH] ltp: 20160126 -> 20160920 > > 1)Upgrade ltp from 20160126 to 20160920. > 2)Delete some patches, since they are integrated upstream. > 0001-ltp-Don-t-link-against-libfl.patch > 0006-sendfile-Use-off64_t-instead-of-__off64_t.patch > 0007-replace-SIGCLD-with-SIGCHLD.patch > 0009-Guard-error.h-with-__GLIBC__.patch > 0012-fsstress.c-Replace-__int64_t-with-int64_t.patch > 0013-include-fcntl.h-for-getting-O_-definitions.patch > 0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch > 0015-mincore01-Rename-PAGESIZE-to-pagesize.patch > 0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch > 0017-replace-sigval_t-with-union-sigval.patch > 0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch > 0022-include-sys-types.h.patch > 0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch > 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch > 0029-trace_shed-Fix-build-with-musl.patch > 0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch > 0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch > 0032-regen.sh-Include-asm-unistd.h-explicitly.patch > 0035-fix-test_proc_kill-hang.patch > 3)Modify one patch, since the data has been changed. > 0011-Rename-sigset-variable-to-sigset1.patch > 4)Add some new patches. > 0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch > 0002-initialize-recursive-mutex-in-a-portable-way.patch > 0003-lapi-Use-sig_t-instead-of-sighandler_t.patch > 0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch > 0005-Fix-test_proc_kill-hanging.patch > 0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch > > Signed-off-by: Wang Xin> --- > ...-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch | 32 ++ > .../ltp/0001-ltp-Don-t-link-against-libfl.patch| 30 -- > ...tialize-recursive-mutex-in-a-portable-way.patch | 167 + > ...3-lapi-Use-sig_t-instead-of-sighandler_t.patch} | 30 +- > ...n-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch | 120 +++ > ...patch => 0005-Fix-test_proc_kill-hanging.patch} | 25 +- > ...move-unused-__BEGIN_DECLS-and-__END_DECLS.patch | 48 +++ > ...sendfile-Use-off64_t-instead-of-__off64_t.patch | 31 -- > .../ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch | 394 - > > .../ltp/0009-Guard-error.h-with-__GLIBC__.patch| 270 - > - > .../0011-Rename-sigset-variable-to-sigset1.patch | 60 ++-- > ...fsstress.c-Replace-__int64_t-with-int64_t.patch | 351 - > - > ...nclude-fcntl.h-for-getting-O_-definitions.patch | 67 > ...ing-Include-sys-types.h-for-pid_t-definit.patch | 56 --- > ...015-mincore01-Rename-PAGESIZE-to-pagesize.patch | 64 > ...Change-header-from-ustat.h-to-sys-ustat.h.patch | 45 --- > .../0017-replace-sigval_t-with-union-sigval.patch | 88 - > ...lace-canonicalize_file_name-with-realpath.patch | 32 -- > .../ltp/ltp/0022-include-sys-types.h.patch | 29 -- > ...sconf01-Use-_SC_2_C_VERSION-conditionally.patch | 29 -- > .../ltp/0029-trace_shed-Fix-build-with-musl.patch | 32 -- > ...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 33 -- > ...age-size-offset-as-per-page-size-alignmen.patch | 33 -- > ...-regen.sh-Include-asm-unistd.h-explicitly.patch | 30 -- > .../ltp/{ltp_20160126.bb => ltp_20160920.bb} | 27 +- > 25 files changed, 433 insertions(+), 1690 deletions(-) > create mode 100644 meta/recipes-extended/ltp/ltp/0001-Define- > __SIGRTMIN-and-__SIGRTMAX-on-musl.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link- > against-libfl.patch > create mode 100644 meta/recipes-extended/ltp/ltp/0002-initialize- > recursive-mutex-in-a-portable-way.patch > rename meta/recipes-extended/ltp/ltp/{0028-rt_sigaction.h-Use- > sighandler_t-instead-of-__sighand.patch => 0003-lapi-Use-sig_t-instead- > of-sighandler_t.patch} (59%) > create mode 100644 meta/recipes-extended/ltp/ltp/0004-rt_sigaction- > rt_sigprocmark-Replace-SA_NOMASK-with-S.patch > rename meta/recipes-extended/ltp/ltp/{0035-fix-test_proc_kill- > hang.patch => 0005-Fix-test_proc_kill-hanging.patch} (52%) > create mode 100644 meta/recipes-extended/ltp/ltp/0006-Remove-unused- > __BEGIN_DECLS-and-__END_DECLS.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0006-sendfile-Use- > off64_t-instead-of-__off64_t.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD- > with-SIGCHLD.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0009-Guard-error.h- > with-__GLIBC__.patch > delete mode 100644 meta/recipes-extended/ltp/ltp/0012-fsstress.c- >
Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 SPEC
Ping. > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > Sent: Monday, October 17, 2016 9:04 AM > To: Maxin B. John; Jan-Simon Möller > Cc: jsmoel...@linuxfoundation.org; openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 SPEC > > Hi Maxin, Simon > > > > Instead of requesting the user to install the DoSOCSv2 from github > > > or other repos, can we make the spdx.bbclass depend on "dosocs-native" > > or > > > similar and make that "DoSOCSv2" recipe available in oe-core ? > > > > That's a good idea. I will try. > > I tried to make DoSOCSv2 recipe to oe-core, and find that there are at least > the following direct dependencies that not belong to oe-core. > > PostgreSQL > python-psycopg2 > jinja2 > python-magic > docopt > SQLAlchemy > psycopg2 > > I think it difficult to add them all into oe-core and it's the reason that why > the original spdx module didn't add fossology into oe-core. > > > > Best regards > Lei > > > > -----Original Message- > > From: openembedded-core-boun...@lists.openembedded.org > > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > > Lei, Maohui > > Sent: Thursday, September 22, 2016 10:19 AM > > To: Maxin B. John; Jan-Simon Möller > > Cc: jsmoel...@linuxfoundation.org; openembedded- > > c...@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 > > SPEC > > > > Hi Maxin, Simon > > > > > It would be nice to include the reason for change from fossology to > > > dosocs2 in the commit message too (from cover letter) > > > > OK, I will add the reasons into the commit message in v3. > > > > > Instead of requesting the user to install the DoSOCSv2 from github > > > or other repos, can we make the spdx.bbclass depend on "dosocs-native" > > or > > > similar and make that "DoSOCSv2" recipe available in oe-core ? > > > > That's a good idea. I will try. > > > > > > Best Regards > > Lei > > > > > > > -Original Message- > > > From: Maxin B. John [mailto:maxin.j...@intel.com] > > > Sent: Monday, September 19, 2016 6:58 PM > > > To: Lei, Maohui > > > Cc: openembedded-core@lists.openembedded.org; > > > jsmoel...@linuxfoundation.org > > > Subject: Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support > > > spdx2.0 SPEC > > > > > > Hi, > > > > > > Please find my comments below: > > > > > > On Mon, Sep 19, 2016 at 04:39:50PM +0800, Lei Maohui wrote: > > > > More: > > > > - change spdx tool from fossology to dosocs2 > > > > > > It would be nice to include the reason for change from fossology to > > > dosocs2 in the commit message too (from cover letter) > > > > > > > Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com> > > > > --- > > > > meta/classes/spdx.bbclass | 505 > > > > ++-- > > > -- > > > > meta/conf/licenses.conf | 67 +- > > > > 2 files changed, 198 insertions(+), 374 deletions(-) > > > > > > > > diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass > > > > index 0c92765..27c0fa0 100644 > > > > --- a/meta/classes/spdx.bbclass > > > > +++ b/meta/classes/spdx.bbclass > > > > @@ -1,365 +1,252 @@ > > > > # This class integrates real-time license scanning, generation of > > > > SPDX standard # output and verifiying license info during the > > > building process. > > > > -# It is a combination of efforts from the OE-Core, SPDX and > > > Fossology projects. > > > > +# It is a combination of efforts from the OE-Core, SPDX and > > > > +DoSOCSv2 > > > projects. > > > > # > > > > -# For more information on FOSSology: > > > > -# http://www.fossology.org > > > > -# > > > > -# For more information on FOSSologySPDX commandline: > > > > -# https://github.com/spdx-tools/fossology-spdx/wiki/Fossology- > > > SPDX-Web-API > > > > +# For more information on DoSOCSv2: > > > > +# https://github.com/DoSOCSv2 > > > > > > Instead of requesting the user to install the
Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 SPEC
Hi Simon > Where do we stand: > - v1 of patch submitted > - comment to create/use dosocs-native tp avoid the separate install (well, +1) > - comment that "the following direct dependencies that not belong to oe-core" Sorry, I mean it's difficult to add them all into oe-core, because as you know, oe-core only contains base layer of recipes. But I don't think these recipes are base enough. So, I think it's easier to let user install dosocs themselves. > @Lei: can you find where those dependencies are ? > (https://layers.openembedded.org/layerindex/branch/morty/recipes/) The situation of these dependences is the following: PostgreSQL - meta-oe python-psycopg2 - meta-openstack jinja2 - meta-python/meta-openstack docopt - not found SQLAlchemy - meta-python Best regards Lei > -Original Message- > From: Jan-Simon Möller [mailto:dl...@gmx.de] > Sent: Thursday, November 03, 2016 5:06 PM > To: Lei, Maohui > Cc: Maxin B. John; openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 SPEC > > Hi Lei, Maxin! > > Where do we stand: > - v1 of patch submitted > - comment to create/use dosocs-native tp avoid the separate install (well, +1) > - comment that "the following direct dependencies that not belong to oe-core" > > Did I summarize that correctly ? > > @Maxin: what would you propose, work on the dependencies or let the user > install ? > @Lei: can you find where those dependencies are ? > (https://layers.openembedded.org/layerindex/branch/morty/recipes/) > > Best, > Jan-Simon > > Am Donnerstag, 3. November 2016, 04:02:42 schrieb Lei, Maohui: > > Ping. > > > > > > > > > -Original Message- > > > From: openembedded-core-boun...@lists.openembedded.org > > > [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of > > > Lei, Maohui > > > Sent: Monday, October 17, 2016 9:04 AM > > > To: Maxin B. John; Jan-Simon Möller > > > Cc: jsmoel...@linuxfoundation.org; > > > openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH > > > v2 1/1] Make yocto-spdx support spdx2.0 SPEC Hi Maxin, Simon > > > > > > > > > > > Instead of requesting the user to install the DoSOCSv2 from github > > > > > or other repos, can we make the spdx.bbclass depend on > > > > > "dosocs-native" > > > > > > > > or > > > > > > > > > similar and make that "DoSOCSv2" recipe available in oe-core ? > > > > > > > > > > > > > > > > That's a good idea. I will try. > > > > > > > > > I tried to make DoSOCSv2 recipe to oe-core, and find that there are at > > > least > the following direct dependencies that not belong to oe-core. > > > > > > PostgreSQL > > > python-psycopg2 > > > jinja2 > > > python-magic > > > docopt > > > SQLAlchemy > > > psycopg2 > > > > > > I think it difficult to add them all into oe-core and it's the reason that > > > why > the original spdx module didn't add fossology into oe-core. > > > > > > > > > > > > Best regards > > > Lei > > > > > > > > > > > > > -Original Message- > > > > From: openembedded-core-boun...@lists.openembedded.org > > > > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > > > > Lei, Maohui > > > > Sent: Thursday, September 22, 2016 10:19 AM > > > > To: Maxin B. John; Jan-Simon Möller > > > > Cc: jsmoel...@linuxfoundation.org; openembedded- > > > > c...@lists.openembedded.org > > > > Subject: Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 > > > > SPEC > > > > > > > > > > > > > > > > Hi Maxin, Simon > > > > > > > > > > > > > > > > > It would be nice to include the reason for change from fossology to > > > > > dosocs2 in the commit message too (from cover letter) > > > > > > > > > > > > > > > > OK, I will add the reasons into the commit message in v3. > > > > > > > > > > > > > > > > > Instead of requesting the user to install the DoSOCSv2 from github > > > > > or other repos, can we make the spdx.bbclass depend on > > > > > "dosocs-native" &
Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 SPEC
Hi Maxin, Simon > > Instead of requesting the user to install the DoSOCSv2 from github or > > other repos, can we make the spdx.bbclass depend on "dosocs-native" > or > > similar and make that "DoSOCSv2" recipe available in oe-core ? > > That's a good idea. I will try. I tried to make DoSOCSv2 recipe to oe-core, and find that there are at least the following direct dependencies that not belong to oe-core. PostgreSQL python-psycopg2 jinja2 python-magic docopt SQLAlchemy psycopg2 I think it difficult to add them all into oe-core and it's the reason that why the original spdx module didn't add fossology into oe-core. Best regards Lei > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > Lei, Maohui > Sent: Thursday, September 22, 2016 10:19 AM > To: Maxin B. John; Jan-Simon Möller > Cc: jsmoel...@linuxfoundation.org; openembedded- > c...@lists.openembedded.org > Subject: Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 > SPEC > > Hi Maxin, Simon > > > It would be nice to include the reason for change from fossology to > > dosocs2 in the commit message too (from cover letter) > > OK, I will add the reasons into the commit message in v3. > > > Instead of requesting the user to install the DoSOCSv2 from github or > > other repos, can we make the spdx.bbclass depend on "dosocs-native" > or > > similar and make that "DoSOCSv2" recipe available in oe-core ? > > That's a good idea. I will try. > > > Best Regards > Lei > > > > -Original Message- > > From: Maxin B. John [mailto:maxin.j...@intel.com] > > Sent: Monday, September 19, 2016 6:58 PM > > To: Lei, Maohui > > Cc: openembedded-core@lists.openembedded.org; > > jsmoel...@linuxfoundation.org > > Subject: Re: [OE-core] [PATCH v2 1/1] Make yocto-spdx support spdx2.0 > > SPEC > > > > Hi, > > > > Please find my comments below: > > > > On Mon, Sep 19, 2016 at 04:39:50PM +0800, Lei Maohui wrote: > > > More: > > > - change spdx tool from fossology to dosocs2 > > > > It would be nice to include the reason for change from fossology to > > dosocs2 in the commit message too (from cover letter) > > > > > Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com> > > > --- > > > meta/classes/spdx.bbclass | 505 > > > ++-- > > -- > > > meta/conf/licenses.conf | 67 +- > > > 2 files changed, 198 insertions(+), 374 deletions(-) > > > > > > diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass > > > index 0c92765..27c0fa0 100644 > > > --- a/meta/classes/spdx.bbclass > > > +++ b/meta/classes/spdx.bbclass > > > @@ -1,365 +1,252 @@ > > > # This class integrates real-time license scanning, generation of > > > SPDX standard # output and verifiying license info during the > > building process. > > > -# It is a combination of efforts from the OE-Core, SPDX and > > Fossology projects. > > > +# It is a combination of efforts from the OE-Core, SPDX and > > > +DoSOCSv2 > > projects. > > > # > > > -# For more information on FOSSology: > > > -# http://www.fossology.org > > > -# > > > -# For more information on FOSSologySPDX commandline: > > > -# https://github.com/spdx-tools/fossology-spdx/wiki/Fossology- > > SPDX-Web-API > > > +# For more information on DoSOCSv2: > > > +# https://github.com/DoSOCSv2 > > > > Instead of requesting the user to install the DoSOCSv2 from github or > > other repos, can we make the spdx.bbclass depend on "dosocs-native" > or > > similar and make that "DoSOCSv2" recipe available in oe-core ? > > > > That might make it easy to use this class. > > > > > # For more information on SPDX: > > > # http://www.spdx.org > > > # > > > +# Note: > > > +# 1) Make sure DoSOCSv2 has beed installed in your host # 2) By > > > +default,spdx files will be output to the path which is defined > > as[SPDX_MANIFEST_DIR] > > > +#in ./meta/conf/licenses.conf. > > > > > > -# SPDX file will be output to the path which is defined > > > as[SPDX_MANIFEST_DIR] -# in ./meta/conf/licenses.conf. > > > +SPDXOUTPUTDIR = "${WORKDIR}/spdx_output_dir" > > > SPDXSSTATEDIR = "${WORKDIR}/spdx_sstate_dir" > > > > > >
Re: [OE-core] [PATCH] libpcap: Disable exposed bits of WinPCAP remote capture support
Hi all I met the same issue when I build wireshark comes from meta-oe. Why this patch hasn't been merged yet? Best regards Lei > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Fabio Berton > Sent: Wednesday, November 23, 2016 2:16 AM > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH] libpcap: Disable exposed bits of WinPCAP remote > capture support > > Disable bits of remote capture support inherited from the WinPCAP merge which > cause applications to fails to build if they define HAVE_REMOTE. > > Signed-off-by: Fabio Berton> --- > .../libpcap/libpcap/disable-remote.patch | 36 > ++ > meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb | 1 + > 2 files changed, 37 insertions(+) > create mode 100644 meta/recipes-connectivity/libpcap/libpcap/disable- > remote.patch > > diff --git a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch > b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch > new file mode 100644 > index 000..7e1eea6 > --- /dev/null > +++ b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch > @@ -0,0 +1,36 @@ > +Disable bits of remote capture support inherited from the WinPCAP merge > +which cause applications to FTBFS if they define HAVE_REMOTE. > + > +Patch from: > +https://anonscm.debian.org/cgit/users/rfrancoise/libpcap.git/commit/? > +id=f35949969269dfdcc3549b12fade604755e1e326 > + > +Upstream-Status: Pending > + > +--- a/pcap/pcap.h > b/pcap/pcap.h > +@@ -506,6 +506,11 @@ > + #define MODE_STAT 1 > + #define MODE_MON 2 > + > ++#ifdef HAVE_REMOTE > ++ /* Includes most of the public stuff that is needed for the remote > ++capture */ > ++ #include > ++#endif /* HAVE_REMOTE */ > ++ > + #elif defined(MSDOS) > + > + /* > +@@ -526,11 +531,6 @@ > + > + #endif /* _WIN32/MSDOS/UN*X */ > + > +-#ifdef HAVE_REMOTE > +- /* Includes most of the public stuff that is needed for the remote > +capture */ > +- #include > +-#endif /* HAVE_REMOTE */ > +- > + #ifdef __cplusplus > + } > + #endif > + > diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb > b/meta/recipes- > connectivity/libpcap/libpcap_1.8.1.bb > index 9072fe0..8ce18e5 100644 > --- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb > +++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb > @@ -2,6 +2,7 @@ require libpcap.inc > > SRC_URI += " \ > file://libpcap-pkgconfig-support.patch \ > +file://disable-remote.patch \ > " > > SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447" > -- > 2.1.4 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Fix build error when enable archiver.
Hi Peter > This cannot be correct. If I am not mistaken, then this would > effectively disable the archiver class from outputting anything for > native packages. I don't think there is any necessary to create archiver for xx-native as same as no need to create packages for xx-native. xx-native is only useful on build system, it is not outcome of build system. Best regards Lei > -Original Message- > From: Peter Kjellerstedt [mailto:peter.kjellerst...@axis.com] > Sent: Thursday, June 14, 2018 6:55 PM > To: Lei, Maohui; openembedded-core@lists.openembedded.org > Subject: RE: [OE-core] [PATCH] Fix build error when enable archiver. > > > -Original Message- > > From: openembedded-core-boun...@lists.openembedded.org > > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > > Lei Maohui > > Sent: den 2 juni 2018 23:04 > > To: openembedded-core@lists.openembedded.org > > Subject: [OE-core] [PATCH] Fix build error when enable archiver. > > > > The error is as fllowing: > > ERROR: Task do_deploy_archives in > > virtual:native:/yocto/poky/meta/recipes-extended/newt/libnewt_0.52.20.bb > depends upon non-existent task > > do_package_write_rpm in virtual:native:/yocto/poky/meta/recipes- > extended/newt/libnewt_0.52.20.bb > > ERROR: Command execution failed: 1 > > > > Signed-off-by: Lei Maohui > > --- > > meta/classes/nopackages.bbclass | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/meta/classes/nopackages.bbclass > b/meta/classes/nopackages.bbclass > > index 559f507..d9ddfac 100644 > > --- a/meta/classes/nopackages.bbclass > > +++ b/meta/classes/nopackages.bbclass > > @@ -10,3 +10,4 @@ deltask do_package_write_ipk_setscene > > deltask do_package_write_deb_setscene > > deltask do_package_qa_setscene > > deltask do_packagedata_setscene > > +deltask do_deploy_archives > > -- > > 1.9.1 > > This cannot be correct. If I am not mistaken, then this would > effectively disable the archiver class from outputting anything for > native packages. > > //Peter > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Fix build error when enable archiver.
The error is as fllowing: ERROR: Task do_deploy_archives in virtual:native:/yocto/poky/meta/recipes-extended/newt/libnewt_0.52.20.bb depends upon non-existent task do_package_write_rpm in virtual:native:/yocto/poky/meta/recipes-extended/newt/libnewt_0.52.20.bb ERROR: Command execution failed: 1 Signed-off-by: Lei Maohui --- meta/classes/nopackages.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/nopackages.bbclass b/meta/classes/nopackages.bbclass index 559f507..d9ddfac 100644 --- a/meta/classes/nopackages.bbclass +++ b/meta/classes/nopackages.bbclass @@ -10,3 +10,4 @@ deltask do_package_write_ipk_setscene deltask do_package_write_deb_setscene deltask do_package_qa_setscene deltask do_packagedata_setscene +deltask do_deploy_archives -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] linux-libc-headers: To fix build error when enable mutilib on aarch64 Big endian.
ping > -Original Message- > From: Lei, Maohui > Sent: Saturday, May 19, 2018 2:38 AM > To: openembedded-core@lists.openembedded.org > Cc: Lei, Maohui > Subject: [OE-core][PATCH] linux-libc-headers: To fix build error when enable > mutilib on aarch64 Big endian. > > Signed-off-by: Lei Maohui > --- > meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 4 > 1 file changed, 4 insertions(+) > > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc > b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc > index 9903c06..b5cf96d 100644 > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc > @@ -77,6 +77,10 @@ do_install_append_arm () { > do_install_armmultilib > } > > +do_install_append_armeb () { > + do_install_armmultilib > +} > + > do_install_armmultilib () { > oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h > asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h > asm/param.h asm/perf_regs.h asm/bpf_perf_event.h > oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h > asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h > asm/swab.h > asm/types.h asm/unistd.h > -- > 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-libc-headers: To fix build error when enable mutilib on aarch64 Big endian.
Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com> --- meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index 9903c06..b5cf96d 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -77,6 +77,10 @@ do_install_append_arm () { do_install_armmultilib } +do_install_append_armeb () { + do_install_armmultilib +} + do_install_armmultilib () { oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h asm/bpf_perf_event.h oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h asm/swab.h asm/types.h asm/unistd.h -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] linux-libc-headers: To fix build error when enable mutilib on aarch64 Big endian.
Ping > -Original Message- > From: Lei, Maohui > Sent: Saturday, May 19, 2018 2:38 AM > To: openembedded-core@lists.openembedded.org > Cc: Lei, Maohui > Subject: [OE-core][PATCH] linux-libc-headers: To fix build error when enable > mutilib on aarch64 Big endian. > > Signed-off-by: Lei Maohui > --- > meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 4 > 1 file changed, 4 insertions(+) > > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc > b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc > index 9903c06..b5cf96d 100644 > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc > @@ -77,6 +77,10 @@ do_install_append_arm () { > do_install_armmultilib > } > > +do_install_append_armeb () { > + do_install_armmultilib > +} > + > do_install_armmultilib () { > oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h > asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h > asm/param.h asm/perf_regs.h asm/bpf_perf_event.h > oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h > asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h > asm/swab.h > asm/types.h asm/unistd.h > -- > 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [sumo][PATCH] glibc: fix CVE-2017-18269 and CVE-2018-11236
From: Zhixiong Chi Backport two CVE patches from the upstream https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=summary commit 5460617d1567657621107d895ee2dd83bc1f88f2 commit cd66c0e584c6d692bc8347b5e72723d02b8a8ada (From OE-Core rev: 398ac946745bbfad55deb382aeafec0be3298819) Signed-off-by: Zhixiong Chi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc/CVE-2017-18269.patch | 178 + meta/recipes-core/glibc/glibc/CVE-2018-11236.patch | 164 +++ meta/recipes-core/glibc/glibc_2.27.bb | 2 + 3 files changed, 344 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2017-18269.patch create mode 100644 meta/recipes-core/glibc/glibc/CVE-2018-11236.patch diff --git a/meta/recipes-core/glibc/glibc/CVE-2017-18269.patch b/meta/recipes-core/glibc/glibc/CVE-2017-18269.patch new file mode 100644 index 000..d873c51 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/CVE-2017-18269.patch @@ -0,0 +1,178 @@ +From cd66c0e584c6d692bc8347b5e72723d02b8a8ada Mon Sep 17 00:00:00 2001 +From: Andrew Senkevich +Date: Fri, 23 Mar 2018 16:19:45 +0100 +Subject: [PATCH] Fix i386 memmove issue (bug 22644). + + [BZ #22644] + * sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S: Fixed + branch conditions. + * string/test-memmove.c (do_test2): New testcase. + +Upstream-Status: Backport +CVE: CVE-2017-18269 +Signed-off-by: Zhixiong Chi +--- + ChangeLog | 8 +++ + string/test-memmove.c | 58 ++ + .../i386/i686/multiarch/memcpy-sse2-unaligned.S| 12 ++--- + 3 files changed, 72 insertions(+), 6 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 18ed09e..afdb766 100644 +--- a/ChangeLog b/ChangeLog +@@ -1,3 +1,11 @@ ++2018-03-23 Andrew Senkevich ++ Max Horn ++ ++ [BZ #22644] ++ * sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S: Fixed ++ branch conditions. ++ * string/test-memmove.c (do_test2): New testcase. ++ + 2018-02-22 Andrew Waterman + + [BZ # 22884] +diff --git a/string/test-memmove.c b/string/test-memmove.c +index edc7a4c..64e3651 100644 +--- a/string/test-memmove.c b/string/test-memmove.c +@@ -24,6 +24,7 @@ + # define TEST_NAME "memmove" + #endif + #include "test-string.h" ++#include + + char *simple_memmove (char *, const char *, size_t); + +@@ -245,6 +246,60 @@ do_random_tests (void) + } + } + ++static void ++do_test2 (void) ++{ ++ size_t size = 0x2000; ++ uint32_t * large_buf; ++ ++ large_buf = mmap ((void*) 0x7000, size, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_ANON, -1, 0); ++ ++ if (large_buf == MAP_FAILED) ++error (EXIT_UNSUPPORTED, errno, "Large mmap failed"); ++ ++ if ((uintptr_t) large_buf > 0x8000 - 128 ++ || 0x8000 - (uintptr_t) large_buf > 0x2000) ++{ ++ error (0, 0, "Large mmap allocated improperly"); ++ ret = EXIT_UNSUPPORTED; ++ munmap ((void *) large_buf, size); ++ return; ++} ++ ++ size_t bytes_move = 0x8000 - (uintptr_t) large_buf; ++ size_t arr_size = bytes_move / sizeof (uint32_t); ++ size_t i; ++ ++ FOR_EACH_IMPL (impl, 0) ++{ ++ for (i = 0; i < arr_size; i++) ++large_buf[i] = (uint32_t) i; ++ ++ uint32_t * dst = _buf[33]; ++ ++#ifdef TEST_BCOPY ++ CALL (impl, (char *) large_buf, (char *) dst, bytes_move); ++#else ++ CALL (impl, (char *) dst, (char *) large_buf, bytes_move); ++#endif ++ ++ for (i = 0; i < arr_size; i++) ++ { ++if (dst[i] != (uint32_t) i) ++ { ++error (0, 0, ++ "Wrong result in function %s dst \"%p\" src \"%p\" offset \"%zd\"", ++ impl->name, dst, large_buf, i); ++ret = 1; ++break; ++ } ++ } ++} ++ ++ munmap ((void *) large_buf, size); ++} ++ + int + test_main (void) + { +@@ -284,6 +339,9 @@ test_main (void) + } + + do_random_tests (); ++ ++ do_test2 (); ++ + return ret; + } + +diff --git a/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S b/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S +index 9c3bbe7..9aa17de 100644 +--- a/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S b/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S +@@ -72,7 +72,7 @@ ENTRY (MEMCPY) + cmp %edx, %eax + + # ifdef USE_AS_MEMMOVE +- jg L(check_forward) ++ ja L(check_forward) + + L(mm_len_0_or_more_backward): + /* Now do checks for lengths. We do [0..16], [16..32], [32..64], [64..128] +@@ -81,7 +81,7 @@ L(mm_len_0_or_more_backward): + jbe L(mm_len_0_16_bytes_backward) + + cmpl$32, %ecx +- jg L(mm_len_32_or_more_backward) ++ ja L(mm_len_32_or_more_backward) + + /* Copy [0..32] and return. */ + movdqu (%eax), %xmm0 +@@ -92,7 +92,7 @@ L(mm_len_0_or_more_backward): + +
[OE-core] [PATCH] nss: Fix build error for aarch64be.
Signed-off-by: Lei Maohui --- meta/recipes-support/nss/nss_3.35.bb | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-support/nss/nss_3.35.bb b/meta/recipes-support/nss/nss_3.35.bb index 84f1916..21da7ec 100644 --- a/meta/recipes-support/nss/nss_3.35.bb +++ b/meta/recipes-support/nss/nss_3.35.bb @@ -91,6 +91,8 @@ do_compile() { OS_TEST=ppc64 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then OS_TEST=mips +elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then +OS_TEST="aarch64" else OS_TEST="${TARGET_ARCH}" fi @@ -146,6 +148,9 @@ do_install() { OS_TEST=ppc64 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then OS_TEST=mips +elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then +CPU_ARCH=aarch64 +OS_TEST="aarch64" else OS_TEST="${TARGET_ARCH}" fi -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] glibc: fix CVE-2017-18269 and CVE-2018-11236
Hi Ross Ok, I'll do it. Thank you for your reply. Best regards Lei > -Original Message- > From: Burton, Ross [mailto:ross.bur...@intel.com] > Sent: Tuesday, June 19, 2018 7:40 PM > To: Lei, Maohui > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] glibc: fix CVE-2017-18269 and CVE-2018-11236 > > If you submit it as a sumo backport, then yes. > > Ross > > On 19 June 2018 at 07:29, Lei, Maohui wrote: > > Hi, > > > > Is there any plan to merge this patch into sumo branch? It is also apply to > sumo branch. > > > > Best regards > > Lei > > > >> -Original Message- > >> From: openembedded-core-boun...@lists.openembedded.org > >> [mailto:openembedded- > >> core-boun...@lists.openembedded.org] On Behalf Of Zhixiong Chi > >> Sent: Thursday, June 07, 2018 6:02 PM > >> To: openembedded-core@lists.openembedded.org > >> Subject: [OE-core] [PATCH] glibc: fix CVE-2017-18269 and CVE-2018-11236 > >> > >> Backport two CVE patches from the upstream > >> https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=summary > >> commit 5460617d1567657621107d895ee2dd83bc1f88f2 > >> commit cd66c0e584c6d692bc8347b5e72723d02b8a8ada > >> > >> Signed-off-by: Zhixiong Chi > >> --- > >> meta/recipes-core/glibc/glibc/CVE-2017-18269.patch | 178 > + > >> meta/recipes-core/glibc/glibc/CVE-2018-11236.patch | 164 > +++ > >> meta/recipes-core/glibc/glibc_2.27.bb | 2 + > >> 3 files changed, 344 insertions(+) > >> create mode 100644 meta/recipes-core/glibc/glibc/CVE-2017-18269.patch > >> create mode 100644 meta/recipes-core/glibc/glibc/CVE-2018-11236.patch > >> > >> diff --git a/meta/recipes-core/glibc/glibc/CVE-2017-18269.patch > b/meta/recipes- > >> core/glibc/glibc/CVE-2017-18269.patch > >> new file mode 100644 > >> index 00..d873c51e60 > >> --- /dev/null > >> +++ b/meta/recipes-core/glibc/glibc/CVE-2017-18269.patch > >> @@ -0,0 +1,178 @@ > >> +From cd66c0e584c6d692bc8347b5e72723d02b8a8ada Mon Sep 17 00:00:00 2001 > >> +From: Andrew Senkevich > >> +Date: Fri, 23 Mar 2018 16:19:45 +0100 > >> +Subject: [PATCH] Fix i386 memmove issue (bug 22644). > >> + > >> + [BZ #22644] > >> + * sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S: Fixed > >> + branch conditions. > >> + * string/test-memmove.c (do_test2): New testcase. > >> + > >> +Upstream-Status: Backport > >> +CVE: CVE-2017-18269 > >> +Signed-off-by: Zhixiong Chi > >> +--- > >> + ChangeLog | 8 +++ > >> + string/test-memmove.c | 58 > >> ++ > >> + .../i386/i686/multiarch/memcpy-sse2-unaligned.S| 12 ++--- > >> + 3 files changed, 72 insertions(+), 6 deletions(-) > >> + > >> +diff --git a/ChangeLog b/ChangeLog > >> +index 18ed09e..afdb766 100644 > >> +--- a/ChangeLog > >> b/ChangeLog > >> +@@ -1,3 +1,11 @@ > >> ++2018-03-23 Andrew Senkevich > >> ++Max Horn > >> ++ > >> ++[BZ #22644] > >> ++* sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S: Fixed > >> ++branch conditions. > >> ++* string/test-memmove.c (do_test2): New testcase. > >> ++ > >> + 2018-02-22 Andrew Waterman > >> + > >> + [BZ # 22884] > >> +diff --git a/string/test-memmove.c b/string/test-memmove.c > >> +index edc7a4c..64e3651 100644 > >> +--- a/string/test-memmove.c > >> b/string/test-memmove.c > >> +@@ -24,6 +24,7 @@ > >> + # define TEST_NAME "memmove" > >> + #endif > >> + #include "test-string.h" > >> ++#include > >> + > >> + char *simple_memmove (char *, const char *, size_t); > >> + > >> +@@ -245,6 +246,60 @@ do_random_tests (void) > >> + } > >> + } > >> + > >> ++static void > >> ++do_test2 (void) > >> ++{ > >> ++ size_t size = 0x2000; > >> ++ uint32_t * large_buf; > >> ++ > >> ++ large_buf = mmap ((void*) 0x7000, size, PROT_READ | PROT_WRITE, > >> ++MAP_PRIVATE | MAP_ANON, -1, 0); > >> ++ > >> ++ if (large_buf == MAP_FAILED) > >> ++error (EXIT_UNSUPPORTED, errno, "Large mmap failed"); >
Re: [OE-core] [PATCH] glibc: fix CVE-2017-18269 and CVE-2018-11236
Hi, Is there any plan to merge this patch into sumo branch? It is also apply to sumo branch. Best regards Lei > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Zhixiong Chi > Sent: Thursday, June 07, 2018 6:02 PM > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH] glibc: fix CVE-2017-18269 and CVE-2018-11236 > > Backport two CVE patches from the upstream > https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=summary > commit 5460617d1567657621107d895ee2dd83bc1f88f2 > commit cd66c0e584c6d692bc8347b5e72723d02b8a8ada > > Signed-off-by: Zhixiong Chi > --- > meta/recipes-core/glibc/glibc/CVE-2017-18269.patch | 178 > + > meta/recipes-core/glibc/glibc/CVE-2018-11236.patch | 164 +++ > meta/recipes-core/glibc/glibc_2.27.bb | 2 + > 3 files changed, 344 insertions(+) > create mode 100644 meta/recipes-core/glibc/glibc/CVE-2017-18269.patch > create mode 100644 meta/recipes-core/glibc/glibc/CVE-2018-11236.patch > > diff --git a/meta/recipes-core/glibc/glibc/CVE-2017-18269.patch > b/meta/recipes- > core/glibc/glibc/CVE-2017-18269.patch > new file mode 100644 > index 00..d873c51e60 > --- /dev/null > +++ b/meta/recipes-core/glibc/glibc/CVE-2017-18269.patch > @@ -0,0 +1,178 @@ > +From cd66c0e584c6d692bc8347b5e72723d02b8a8ada Mon Sep 17 00:00:00 2001 > +From: Andrew Senkevich > +Date: Fri, 23 Mar 2018 16:19:45 +0100 > +Subject: [PATCH] Fix i386 memmove issue (bug 22644). > + > + [BZ #22644] > + * sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S: Fixed > + branch conditions. > + * string/test-memmove.c (do_test2): New testcase. > + > +Upstream-Status: Backport > +CVE: CVE-2017-18269 > +Signed-off-by: Zhixiong Chi > +--- > + ChangeLog | 8 +++ > + string/test-memmove.c | 58 > ++ > + .../i386/i686/multiarch/memcpy-sse2-unaligned.S| 12 ++--- > + 3 files changed, 72 insertions(+), 6 deletions(-) > + > +diff --git a/ChangeLog b/ChangeLog > +index 18ed09e..afdb766 100644 > +--- a/ChangeLog > b/ChangeLog > +@@ -1,3 +1,11 @@ > ++2018-03-23 Andrew Senkevich > ++Max Horn > ++ > ++[BZ #22644] > ++* sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S: Fixed > ++branch conditions. > ++* string/test-memmove.c (do_test2): New testcase. > ++ > + 2018-02-22 Andrew Waterman > + > + [BZ # 22884] > +diff --git a/string/test-memmove.c b/string/test-memmove.c > +index edc7a4c..64e3651 100644 > +--- a/string/test-memmove.c > b/string/test-memmove.c > +@@ -24,6 +24,7 @@ > + # define TEST_NAME "memmove" > + #endif > + #include "test-string.h" > ++#include > + > + char *simple_memmove (char *, const char *, size_t); > + > +@@ -245,6 +246,60 @@ do_random_tests (void) > + } > + } > + > ++static void > ++do_test2 (void) > ++{ > ++ size_t size = 0x2000; > ++ uint32_t * large_buf; > ++ > ++ large_buf = mmap ((void*) 0x7000, size, PROT_READ | PROT_WRITE, > ++MAP_PRIVATE | MAP_ANON, -1, 0); > ++ > ++ if (large_buf == MAP_FAILED) > ++error (EXIT_UNSUPPORTED, errno, "Large mmap failed"); > ++ > ++ if ((uintptr_t) large_buf > 0x8000 - 128 > ++ || 0x8000 - (uintptr_t) large_buf > 0x2000) > ++{ > ++ error (0, 0, "Large mmap allocated improperly"); > ++ ret = EXIT_UNSUPPORTED; > ++ munmap ((void *) large_buf, size); > ++ return; > ++} > ++ > ++ size_t bytes_move = 0x8000 - (uintptr_t) large_buf; > ++ size_t arr_size = bytes_move / sizeof (uint32_t); > ++ size_t i; > ++ > ++ FOR_EACH_IMPL (impl, 0) > ++{ > ++ for (i = 0; i < arr_size; i++) > ++large_buf[i] = (uint32_t) i; > ++ > ++ uint32_t * dst = _buf[33]; > ++ > ++#ifdef TEST_BCOPY > ++ CALL (impl, (char *) large_buf, (char *) dst, bytes_move); > ++#else > ++ CALL (impl, (char *) dst, (char *) large_buf, bytes_move); > ++#endif > ++ > ++ for (i = 0; i < arr_size; i++) > ++{ > ++ if (dst[i] != (uint32_t) i) > ++{ > ++ error (0, 0, > ++ "Wrong result in function %s dst \"%p\" src \"%p\" offset > \"%zd\"", > ++ impl->name, dst, large_buf, i); > ++ ret = 1; > ++ break; > ++} > ++} > ++} > ++ > ++ munmap ((void *) large_buf, size); > ++} > ++ > + int > + test_main (void) > + { > +@@ -284,6 +339,9 @@ test_main (void) > + } > + > + do_random_tests (); > ++ > ++ do_test2 (); > ++ > + return ret; > + } > + > +diff --git a/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S > b/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S > +index 9c3bbe7..9aa17de 100644 > +--- a/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S > b/sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S > +@@ -72,7 +72,7 @@ ENTRY (MEMCPY) > + cmp
Re: [OE-core] [PATCH v2] cross-canadian/libgcc: fix aarch64's multilib SDK
> Please test this patch with musl target preferably arm/aarch64 and also > ppc/glibc by generating SDKs Ok, I'll test it. Best regards. Lei > -Original Message- > From: Khem Raj [mailto:raj.k...@gmail.com] > Sent: Friday, July 27, 2018 11:31 AM > To: Robert Yang; Lei, Maohui; openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH v2] cross-canadian/libgcc: fix aarch64's > multilib > SDK > > > > On 7/25/18 1:04 AM, Robert Yang wrote: > > Hi Maohui, > > > > Thanks for sending it, I do think that oe-core needs this patch. > > > > // Robert > > > > On 06/26/2018 06:27 AM, Lei Maohui wrote: > >> The arm toolchain has a "-gnueabi" suffix, but aarch64 doesn't, this > >> makes multilib sdk doesn't work, there will be error as following: > >> > >> .../usr/libexec/armeb-poky-linux-gux-linux-gnueabi/7.3.0/real-ld: > >> cannot find crtbeginS.o: No such file or directo > >> .../usr/libexec/armeb-poky-linux-gux-linux-gnueabi/7.3.0/real-ld: > >> cannot find -lgcc > >> .../usr/libexec/armeb-poky-linux-gux-linux-gnueabi/7.3.0/real-ld: > >> cannot find -lgcc > >> collect2: error: ld returned 1 exit status > >> > > Please test this patch with musl target preferably arm/aarch64 and also > ppc/glibc by generating SDKs > > >> Signed-off-by: Robert Yang > >> Signed-off-by: Lei Maohui > >> --- > >> meta/recipes-devtools/gcc/libgcc-common.inc | 23 > >> +-- > >> 1 file changed, 17 insertions(+), 6 deletions(-) > >> > >> diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc > >> b/meta/recipes-devtools/gcc/libgcc-common.inc > >> index 848a476..a49fc98 100644 > >> --- a/meta/recipes-devtools/gcc/libgcc-common.inc > >> +++ b/meta/recipes-devtools/gcc/libgcc-common.inc > >> @@ -145,11 +145,22 @@ fakeroot python do_extra_symlinks() { > >> if bb.data.inherits_class('nativesdk', d): > >> return > >> - targetsys = d.getVar('BASETARGET_SYS') > >> + base_targetsys = d.getVar('BASETARGET_SYS') > >> + targetsys = d.getVar('TARGET_SYS') > >> + > >> + if base_targetsys != targetsys: > >> + dest = d.getVar('D') + d.getVar('libdir') + '/' + > >> +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') > >> + abie = d.getVar('ABIEXTENSION') > >> + 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) > >> - if targetsys != d.getVar('TARGET_SYS'): > >> - dest = d.getVar('D') + d.getVar('libdir') + '/' + targetsys > >> - src = d.getVar('TARGET_SYS') > >> - if not os.path.lexists(dest) and > >> os.path.lexists(d.getVar('D') + d.getVar('libdir')): > >> - os.symlink(src, dest) > >> } > >> -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH master, sumo] sysprof: Enable for aarch64.
It can be compiled for aarch64, so deleted the limit for aarch64. Signed-off-by: Lei Maohui --- meta/recipes-kernel/sysprof/sysprof_3.26.1.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb b/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb index 1989b52..7ea11b8 100644 --- a/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb +++ b/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb @@ -25,9 +25,6 @@ FILES_SOLIBSDEV = "" SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}" -# We do not yet work for aarch64. -COMPATIBLE_HOST = "^(?!aarch64).*" - FILES_${PN} += " \ ${datadir}/dbus-1/system-services \ ${datadir}/dbus-1/system.d \ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] cross-canadian/libgcc: fix aarch64's multilib SDK
The arm toolchain has a "-gnueabi" suffix, but aarch64 doesn't, this makes multilib sdk doesn't work, there will be error as following: .../usr/libexec/armeb-poky-linux-gux-linux-gnueabi/7.3.0/real-ld: cannot find crtbeginS.o: No such file or directo .../usr/libexec/armeb-poky-linux-gux-linux-gnueabi/7.3.0/real-ld: cannot find -lgcc .../usr/libexec/armeb-poky-linux-gux-linux-gnueabi/7.3.0/real-ld: cannot find -lgcc collect2: error: ld returned 1 exit status Signed-off-by: Robert Yang Signed-off-by: Lei Maohui --- meta/recipes-devtools/gcc/libgcc-common.inc | 23 +-- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index 848a476..a49fc98 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -145,11 +145,22 @@ fakeroot python do_extra_symlinks() { if bb.data.inherits_class('nativesdk', d): return -targetsys = d.getVar('BASETARGET_SYS') +base_targetsys = d.getVar('BASETARGET_SYS') +targetsys = d.getVar('TARGET_SYS') + +if base_targetsys != targetsys: +dest = d.getVar('D') + d.getVar('libdir') + '/' + 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') +abie = d.getVar('ABIEXTENSION') +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) -if targetsys != d.getVar('TARGET_SYS'): -dest = d.getVar('D') + d.getVar('libdir') + '/' + targetsys -src = d.getVar('TARGET_SYS') -if not os.path.lexists(dest) and os.path.lexists(d.getVar('D') + d.getVar('libdir')): -os.symlink(src, dest) } -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Fix build error when enable archiver.
ping > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > Sent: Tuesday, June 19, 2018 9:22 AM > To: Peter Kjellerstedt; openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] Fix build error when enable archiver. > > Hi Peter > > > This cannot be correct. If I am not mistaken, then this would > > effectively disable the archiver class from outputting anything for > > native packages. > > I don't think there is any necessary to create archiver for xx-native as same > as no need to create packages for xx-native. > xx-native is only useful on build system, it is not outcome of build system. > > Best regards > Lei > > > > -Original Message- > > From: Peter Kjellerstedt [mailto:peter.kjellerst...@axis.com] > > Sent: Thursday, June 14, 2018 6:55 PM > > To: Lei, Maohui; openembedded-core@lists.openembedded.org > > Subject: RE: [OE-core] [PATCH] Fix build error when enable archiver. > > > > > -Original Message- > > > From: openembedded-core-boun...@lists.openembedded.org > > > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > > > Lei Maohui > > > Sent: den 2 juni 2018 23:04 > > > To: openembedded-core@lists.openembedded.org > > > Subject: [OE-core] [PATCH] Fix build error when enable archiver. > > > > > > The error is as fllowing: > > > ERROR: Task do_deploy_archives in > > > virtual:native:/yocto/poky/meta/recipes-extended/newt/libnewt_0.52.20.bb > > depends upon non-existent task > > > do_package_write_rpm in virtual:native:/yocto/poky/meta/recipes- > > extended/newt/libnewt_0.52.20.bb > > > ERROR: Command execution failed: 1 > > > > > > Signed-off-by: Lei Maohui > > > --- > > > meta/classes/nopackages.bbclass | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/meta/classes/nopackages.bbclass > > b/meta/classes/nopackages.bbclass > > > index 559f507..d9ddfac 100644 > > > --- a/meta/classes/nopackages.bbclass > > > +++ b/meta/classes/nopackages.bbclass > > > @@ -10,3 +10,4 @@ deltask do_package_write_ipk_setscene > > > deltask do_package_write_deb_setscene > > > deltask do_package_qa_setscene > > > deltask do_packagedata_setscene > > > +deltask do_deploy_archives > > > -- > > > 1.9.1 > > > > This cannot be correct. If I am not mistaken, then this would > > effectively disable the archiver class from outputting anything for > > native packages. > > > > //Peter > > > > > > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [master][thud][PATCH] nfs-utils: Enable libnfsidmap.
Because libnfsidmap has been remove, enable libnfsidmap to keep consistency of nfs-utils. Signed-off-by: Lei Maohui --- meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb index 6d450c7..0ff7d2d 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb @@ -64,6 +64,7 @@ EXTRA_OECONF = "--with-statduser=rpcuser \ PACKAGECONFIG ??= "tcp-wrappers \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ +nfsv4 \ " PACKAGECONFIG_remove_libc-musl = "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers" @@ -73,7 +74,7 @@ PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper" # keyutils is available in meta-security PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils" -PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats" +PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats libnfsidmap" CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \ ${localstatedir}/lib/nfs/rmtab \ @@ -98,6 +99,8 @@ RDEPENDS_${PN}-stats = "python3-core" FILES_${PN} += "${systemd_unitdir}" +FILES_libnfsidmap += "${libdir}/libnfsidmap" + do_configure_prepend() { sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ ${S}/utils/mount/Makefile.am -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core] [PATCH] Added armeb into meson.bbclass.
Hi, Plesse merge to thud branch. Best regards Lei > -Original Message- > From: Hong, Liu/洪 流 > Sent: Wednesday, January 02, 2019 1:18 PM > To: openembedded-core@lists.openembedded.org > Cc: Lei, Maohui/雷 茂慧 > Subject: [oe-core] [PATCH] Added armeb into meson.bbclass. > > From: Lei Maohui > > Signed-off-by: Lei Maohui > --- > meta/classes/meson.bbclass | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass > index 3cbdcf1..a922ae5 100644 > --- a/meta/classes/meson.bbclass > +++ b/meta/classes/meson.bbclass > @@ -54,6 +54,8 @@ def meson_cpu_family(var, d): > return 'ppc' > elif arch == 'powerpc64': > return 'ppc64' > +elif arch == 'armeb': > +return 'arm' > elif arch == 'mipsel': > return 'mips' > elif re.match(r"i[3-6]86", arch): > -- > 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Added armeb into QEMU_TARGETS.
ping > -Original Message- > From: Hong, Liu/洪 流 > Sent: Wednesday, January 02, 2019 1:18 PM > To: openembedded-core@lists.openembedded.org > Cc: Lei, Maohui/雷 茂慧 > Subject: [OE-core] [PATCH] Added armeb into QEMU_TARGETS. > > From: Lei Maohui > > Signed-off-by: Lei Maohui > --- > meta-poky/conf/distro/poky.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf > index f5de8f2..e9c2681 100644 > --- a/meta-poky/conf/distro/poky.conf > +++ b/meta-poky/conf/distro/poky.conf > @@ -39,7 +39,7 @@ DISTRO_EXTRA_RDEPENDS_append_qemux86-64 = " ${POKYQEMUDEPS}" > > TCLIBCAPPEND = "" > > -QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el nios2 ppc > x86_64" > +QEMU_TARGETS ?= "arm armeb aarch64 i386 mips mipsel mips64 mips64el nios2 ppc > x86_64" > # Other QEMU_TARGETS "sh4" > > PREMIRRORS ??= "\ > -- > 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] icu: Added armeb support.
Make icu support arm32 BE. Upstream-Status: Pending Signed-off-by: Lei Maohui --- .../icu/icu/0001-Make-icu-support-arm-BE.patch | 28 ++ meta/recipes-support/icu/icu_63.1.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch diff --git a/meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch b/meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch new file mode 100644 index 000..019d09e --- /dev/null +++ b/meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch @@ -0,0 +1,28 @@ +From 8fa6cbf2d3de73bdca5e65f6523e4cce334aeee7 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Fri, 14 Dec 2018 16:07:31 +0900 +Subject: [PATCH] Make icu support arm BE. + +Upstream-Status: Pending + +Signed-off-by: Lei Maohui +--- + i18n/double-conversion-utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h +index 0bd3e83..9288e28 100644 +--- a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h +@@ -77,7 +77,7 @@ inline void abort_noreturn() { abort(); } + // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) + // ICU PATCH: Enable ARM32 & ARM64 builds for Windows with 'defined(_M_ARM) || defined(_M_ARM64)'. + #if defined(_M_X64) || defined(__x86_64__) || \ +-defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ ++defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ +-- +2.7.4 + diff --git a/meta/recipes-support/icu/icu_63.1.bb b/meta/recipes-support/icu/icu_63.1.bb index e593dc1..38bfa6a 100644 --- a/meta/recipes-support/icu/icu_63.1.bb +++ b/meta/recipes-support/icu/icu_63.1.bb @@ -17,6 +17,7 @@ SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ file://0002-Add-ARC-support.patch \ + file://0001-Make-icu-support-arm-BE.patch \ " SRC_URI_append_class-target = "\ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
ping > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > Sent: Tuesday, May 14, 2019 2:31 PM > To: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > Hi, > > This patch hasn't been merged yet. Are there any suggestions? > > Best regards > Lei > > > -Original Message- > > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > > Sent: Wednesday, May 08, 2019 11:36 AM > > To: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > > > Ping > > > > > -Original Message- > > > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded- > > > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > > > Sent: Friday, April 26, 2019 1:56 PM > > > To: openembedded-core@lists.openembedded.org > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in > toolchain > > > > > > Hi, > > > > > > I noticed that " dnf: Enable nativesdk " has been merged into master-next. > > This > > > patch is necessary for dnf-nativesdk, so please merge too. > > > > > > Best regards > > > Lei > > > > > > > > > > -Original Message- > > > > From: openembedded-core-boun...@lists.openembedded.org > > [mailto:openembedded- > > > > core-boun...@lists.openembedded.org] On Behalf Of Zheng, Ruoqin > > > > Sent: Friday, April 19, 2019 10:55 AM > > > > To: openembedded-core@lists.openembedded.org > > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in > > toolchain > > > > > > > > ping > > > > > > > > -- > > > > Zheng Ruoqin > > > > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > > > > ADDR.: No.6 Wenzhu Road, Software Avenue, > > > >Nanjing, 210012, China > > > > MAIL : zhengrq.f...@cn.fujistu.com > > > > > > > > > > > > > -Original Message- > > > > > From: Zheng, Ruoqin > > > > > Sent: Saturday, April 13, 2019 10:37 PM > > > > > To: openembedded-core@lists.openembedded.org > > > > > Cc: Zheng, Ruoqin > > > > > Subject: [OE-core][PATCH] toolchain-scripts: make rpm work in > > > > > toolchain > > > > > > > > > > Rpm need to read the arch info, but $script did not provide it, so add > it. > > > > > > > > > > Signed-off-by: Zheng Ruoqin > > > > > --- > > > > > meta/classes/toolchain-scripts.bbclass | 1 + > > > > > 1 file changed, 1 insertion(+) > > > > > > > > > > diff --git a/meta/classes/toolchain-scripts.bbclass > > > b/meta/classes/toolchain- > > > > > scripts.bbclass > > > > > index 1a2ec4f..de50b7e 100644 > > > > > --- a/meta/classes/toolchain-scripts.bbclass > > > > > +++ b/meta/classes/toolchain-scripts.bbclass > > > > > @@ -101,6 +101,7 @@ toolchain_shared_env_script () { > > > > > echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script > > > > > echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script > > > > > echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> > > > > > $script > > > > > + echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script > > > > > echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script > > > > > echo 'export ARCH=${ARCH}' >> $script > > > > > echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script > > > > > -- > > > > > 1.8.3.1 > > > > > > > > > > > > > > > > -- > > > > ___ > > > > Openembedded-core mailing list > > > > Openembedded-core@lists.openembedded.org > > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > > > > -- > > > ___ > > > Openembedded-core mailing list > > > Openembedded-core@lists.openembedded.org > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [warrior][PATCH] createrepo-c: Fix build QA error for nativesdk-createrepo-c.
"QA Issue: nativesdk-createrepo-c rdepends on nativesdk-python3-dev [dev-deps]" Signed-off-by: Lei Maohui --- meta/recipes-devtools/createrepo-c/createrepo-c_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb index 9aa8d2a..4f290ae 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb @@ -20,6 +20,7 @@ inherit cmake pkgconfig bash-completion distutils3-base EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF" +INSANE_SKIP_${PN} += "dev-deps" BBCLASSEXTEND = "native nativesdk" # Direct createrepo to read rpm configuration from our sysroot, not the one it was compiled in -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [warrior][master][PATCH] nativesdk-qemu:Make it support aarch64_be.
Otherwise, there will be "no aarch64_be-softmmu" error. Signed-off-by: Lei Maohui --- meta/recipes-devtools/qemu/qemu-targets.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu-targets.inc b/meta/recipes-devtools/qemu/qemu-targets.inc index 550d6f0..8184ef5 100644 --- a/meta/recipes-devtools/qemu/qemu-targets.inc +++ b/meta/recipes-devtools/qemu/qemu-targets.inc @@ -13,7 +13,7 @@ def get_qemu_target_list(d): softmmuonly += arch + "-softmmu," archs.remove(arch) linuxuseronly = "" -for arch in ['armeb', 'alpha', 'ppc64abi32', 'sparc32plus']: +for arch in ['armeb', 'alpha', 'ppc64abi32', 'sparc32plus', 'aarch64_be']: if arch in archs: linuxuseronly += arch + "-linux-user," archs.remove(arch) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
Hi, Richard > Whilst I can guess why, its not obvious at all the dnf needs > MACHINE_ARCH. I'd probably be happier with a better variable name. > Which code exactly is using it? Arch information is necessary for rpm. As what do for dnf-native in _configure_rpm function, nativesdk-dnf has to do the same work. But the environment for nativesdk doesn't supply arch information. I think MACHINE_ARCH is suitable to supply arch information for nativesdk. How about your Opinion? Best regards Lei > -Original Message- > From: richard.pur...@linuxfoundation.org > [mailto:richard.pur...@linuxfoundation.org] > Sent: Tuesday, June 04, 2019 6:26 PM > To: Lei, Maohui > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > On Tue, 2019-06-04 at 08:29 +, Lei, Maohui wrote: > > Hi Richard > > > > This patch is necessary for dnf-nativesdk which has been merged. But > > this patch is still ignored. > > Do you have any comment about this patch? > > Basically I really don't like exporting "random" variables in the SDK, > particularly when the meaning/use of them isn't clear. > > Whilst I can guess why, its not obvious at all the dnf needs > MACHINE_ARCH. I'd probably be happier with a better variable name. > Which code exactly is using it? > > Cheers, > > Richard > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
Hi Richard This patch is necessary for dnf-nativesdk which has been merged. But this patch is still ignored. Do you have any comment about this patch? Best regards. Lei Maohui > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > Sent: Tuesday, May 28, 2019 1:08 PM > To: Richard Purdie; openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > ping > > > -Original Message- > > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > > Sent: Tuesday, May 14, 2019 2:31 PM > > To: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > > > Hi, > > > > This patch hasn't been merged yet. Are there any suggestions? > > > > Best regards > > Lei > > > > > -Original Message- > > > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded- > > > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > > > Sent: Wednesday, May 08, 2019 11:36 AM > > > To: openembedded-core@lists.openembedded.org > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in > toolchain > > > > > > Ping > > > > > > > -Original Message- > > > > From: openembedded-core-boun...@lists.openembedded.org > > [mailto:openembedded- > > > > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > > > > Sent: Friday, April 26, 2019 1:56 PM > > > > To: openembedded-core@lists.openembedded.org > > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in > > toolchain > > > > > > > > Hi, > > > > > > > > I noticed that " dnf: Enable nativesdk " has been merged into > > > > master-next. > > > This > > > > patch is necessary for dnf-nativesdk, so please merge too. > > > > > > > > Best regards > > > > Lei > > > > > > > > > > > > > -Original Message- > > > > > From: openembedded-core-boun...@lists.openembedded.org > > > [mailto:openembedded- > > > > > core-boun...@lists.openembedded.org] On Behalf Of Zheng, Ruoqin > > > > > Sent: Friday, April 19, 2019 10:55 AM > > > > > To: openembedded-core@lists.openembedded.org > > > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in > > > toolchain > > > > > > > > > > ping > > > > > > > > > > -- > > > > > Zheng Ruoqin > > > > > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > > > > > ADDR.: No.6 Wenzhu Road, Software Avenue, > > > > >Nanjing, 210012, China > > > > > MAIL : zhengrq.f...@cn.fujistu.com > > > > > > > > > > > > > > > > -Original Message- > > > > > > From: Zheng, Ruoqin > > > > > > Sent: Saturday, April 13, 2019 10:37 PM > > > > > > To: openembedded-core@lists.openembedded.org > > > > > > Cc: Zheng, Ruoqin > > > > > > Subject: [OE-core][PATCH] toolchain-scripts: make rpm work in > toolchain > > > > > > > > > > > > Rpm need to read the arch info, but $script did not provide it, so > add > > it. > > > > > > > > > > > > Signed-off-by: Zheng Ruoqin > > > > > > --- > > > > > > meta/classes/toolchain-scripts.bbclass | 1 + > > > > > > 1 file changed, 1 insertion(+) > > > > > > > > > > > > diff --git a/meta/classes/toolchain-scripts.bbclass > > > > b/meta/classes/toolchain- > > > > > > scripts.bbclass > > > > > > index 1a2ec4f..de50b7e 100644 > > > > > > --- a/meta/classes/toolchain-scripts.bbclass > > > > > > +++ b/meta/classes/toolchain-scripts.bbclass > > > > > > @@ -101,6 +101,7 @@ toolchain_shared_env_script () { > > > > > > echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script > > > > > > echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"
[OE-core] [PATCH] openssl: Fix a build bug on aarch64BE.
From: Hong Liu Fix bug as following on aarch64BE: Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' Upstream-Status: Pending [https://github.com/openssl/openssl/pull/9151] Signed-off-by: Lei Maohui --- ...01-Fix-build-error-for-aarch64-big-endian.patch | 41 ++ .../recipes-connectivity/openssl/openssl_1.1.1c.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch new file mode 100644 index 000..65ca02c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch @@ -0,0 +1,41 @@ +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Thu, 13 Jun 2019 12:17:30 +0900 +Subject: [PATCH] Fix build error for aarch64 big endian. + +Modified rev to rev64, because rev only takes integer registers. +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 +Otherwise, the following error will occur. + +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' + +Signed-off-by: Lei Maohui +--- + crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +index dc72f18..6620690 100755 +--- a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +@@ -731,7 +731,7 @@ $code.=<<___; + blo .Lprocess_block_ce + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b + beq .Lprocess_block_ce +@@ -740,7 +740,7 @@ ___ + $code.=<<___; + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[4][4],$A[4][4],v31.16b + +-- +2.7.4 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb index 669b1a1..ec85ccd 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb @@ -16,6 +16,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-skip-test_symbol_presence.patch \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ " SRC_URI_append_class-nativesdk = " \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssl: Fix a build bug on aarch64BE.
Fix bug as following on aarch64BE: Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' Upstream-Status: Pending [https://github.com/openssl/openssl/pull/9151] Signed-off-by: Lei Maohui --- ...01-Fix-build-error-for-aarch64-big-endian.patch | 41 ++ .../recipes-connectivity/openssl/openssl_1.1.1c.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch new file mode 100644 index 000..65ca02c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch @@ -0,0 +1,41 @@ +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Thu, 13 Jun 2019 12:17:30 +0900 +Subject: [PATCH] Fix build error for aarch64 big endian. + +Modified rev to rev64, because rev only takes integer registers. +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 +Otherwise, the following error will occur. + +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' + +Signed-off-by: Lei Maohui +--- + crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +index dc72f18..6620690 100755 +--- a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +@@ -731,7 +731,7 @@ $code.=<<___; + blo .Lprocess_block_ce + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b + beq .Lprocess_block_ce +@@ -740,7 +740,7 @@ ___ + $code.=<<___; + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[4][4],$A[4][4],v31.16b + +-- +2.7.4 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb index 669b1a1..ec85ccd 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb @@ -16,6 +16,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-skip-test_symbol_presence.patch \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ " SRC_URI_append_class-nativesdk = " \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] openssl: Fix a build bug on aarch64BE.
Fix bug as following on aarch64BE: Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' https://github.com/openssl/openssl/pull/9151 Upstream-Status: Submitted Signed-off-by: Lei Maohui --- ...01-Fix-build-error-for-aarch64-big-endian.patch | 41 ++ .../recipes-connectivity/openssl/openssl_1.1.1c.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch new file mode 100644 index 000..65ca02c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch @@ -0,0 +1,41 @@ +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Thu, 13 Jun 2019 12:17:30 +0900 +Subject: [PATCH] Fix build error for aarch64 big endian. + +Modified rev to rev64, because rev only takes integer registers. +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 +Otherwise, the following error will occur. + +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' + +Signed-off-by: Lei Maohui +--- + crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +index dc72f18..6620690 100755 +--- a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +@@ -731,7 +731,7 @@ $code.=<<___; + blo .Lprocess_block_ce + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b + beq .Lprocess_block_ce +@@ -740,7 +740,7 @@ ___ + $code.=<<___; + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[4][4],$A[4][4],v31.16b + +-- +2.7.4 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb index 669b1a1..ec85ccd 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb @@ -16,6 +16,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-skip-test_symbol_presence.patch \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ " SRC_URI_append_class-nativesdk = " \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [warrior][PATCH v2] openssl: Fix a build bug on aarch64BE.
Fix bug as following on aarch64BE: Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' https://github.com/openssl/openssl/pull/9151 Upstream-Status: Submitted Signed-off-by: Lei Maohui --- ...01-Fix-build-error-for-aarch64-big-endian.patch | 41 ++ .../recipes-connectivity/openssl/openssl_1.1.1b.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch new file mode 100644 index 000..65ca02c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch @@ -0,0 +1,41 @@ +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Thu, 13 Jun 2019 12:17:30 +0900 +Subject: [PATCH] Fix build error for aarch64 big endian. + +Modified rev to rev64, because rev only takes integer registers. +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 +Otherwise, the following error will occur. + +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' + +Signed-off-by: Lei Maohui +--- + crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +index dc72f18..6620690 100755 +--- a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +@@ -731,7 +731,7 @@ $code.=<<___; + blo .Lprocess_block_ce + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b + beq .Lprocess_block_ce +@@ -740,7 +740,7 @@ ___ + $code.=<<___; + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[4][4],$A[4][4],v31.16b + +-- +2.7.4 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb index d3404d2..46030c3 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://CVE-2019-1543.patch \ + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ " SRC_URI_append_class-nativesdk = " \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] openssl: Fix a build bug on aarch64BE.
Fix bug as following on aarch64BE: Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' Signed-off-by: Lei Maohui --- ...01-Fix-build-error-for-aarch64-big-endian.patch | 43 ++ .../recipes-connectivity/openssl/openssl_1.1.1c.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch new file mode 100644 index 000..9a90a68 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch @@ -0,0 +1,43 @@ +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Thu, 13 Jun 2019 12:17:30 +0900 +Subject: [PATCH] Fix build error for aarch64 big endian. + +Modified rev to rev64, because rev only takes integer registers. +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 +Otherwise, the following error will occur. + +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' + +Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/9151] + +Signed-off-by: Lei Maohui +--- + crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +index dc72f18..6620690 100755 +--- a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +@@ -731,7 +731,7 @@ $code.=<<___; + blo .Lprocess_block_ce + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b + beq .Lprocess_block_ce +@@ -740,7 +740,7 @@ ___ + $code.=<<___; + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[4][4],$A[4][4],v31.16b + +-- +2.7.4 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb index 669b1a1..ec85ccd 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb @@ -16,6 +16,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-skip-test_symbol_presence.patch \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ " SRC_URI_append_class-nativesdk = " \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [warrior][PATCH v3] openssl: Fix a build bug on aarch64BE.
Fix bug as following on aarch64BE: Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' Signed-off-by: Lei Maohui --- ...01-Fix-build-error-for-aarch64-big-endian.patch | 43 ++ .../recipes-connectivity/openssl/openssl_1.1.1b.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch new file mode 100644 index 000..9a90a68 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch @@ -0,0 +1,43 @@ +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Thu, 13 Jun 2019 12:17:30 +0900 +Subject: [PATCH] Fix build error for aarch64 big endian. + +Modified rev to rev64, because rev only takes integer registers. +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 +Otherwise, the following error will occur. + +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' + +Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/9151] + +Signed-off-by: Lei Maohui +--- + crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +index dc72f18..6620690 100755 +--- a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +@@ -731,7 +731,7 @@ $code.=<<___; + blo .Lprocess_block_ce + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b + beq .Lprocess_block_ce +@@ -740,7 +740,7 @@ ___ + $code.=<<___; + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[4][4],$A[4][4],v31.16b + +-- +2.7.4 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb index d3404d2..46030c3 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://CVE-2019-1543.patch \ + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ " SRC_URI_append_class-nativesdk = " \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
ping > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > Sent: Thursday, June 06, 2019 10:39 AM > To: richard.pur...@linuxfoundation.org > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > Hi, Richard > > > Whilst I can guess why, its not obvious at all the dnf needs > > MACHINE_ARCH. I'd probably be happier with a better variable name. > > Which code exactly is using it? > > Arch information is necessary for rpm. As what do for dnf-native in > _configure_rpm function, nativesdk-dnf has to do the same work. > But the environment for nativesdk doesn't supply arch information. I think > MACHINE_ARCH is suitable to supply arch information for nativesdk. > How about your Opinion? > > Best regards > Lei > > > > > -Original Message- > > From: richard.pur...@linuxfoundation.org > > [mailto:richard.pur...@linuxfoundation.org] > > Sent: Tuesday, June 04, 2019 6:26 PM > > To: Lei, Maohui > > Cc: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > > > On Tue, 2019-06-04 at 08:29 +, Lei, Maohui wrote: > > > Hi Richard > > > > > > This patch is necessary for dnf-nativesdk which has been merged. But > > > this patch is still ignored. > > > Do you have any comment about this patch? > > > > Basically I really don't like exporting "random" variables in the SDK, > > particularly when the meaning/use of them isn't clear. > > > > Whilst I can guess why, its not obvious at all the dnf needs > > MACHINE_ARCH. I'd probably be happier with a better variable name. > > Which code exactly is using it? > > > > Cheers, > > > > Richard > > > > > > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] openssl: Fix a build bug on aarch64BE.
Hi I'm sorry I misunderstood. I have submitted v3 version. Please have a review. Best regards Lei > -Original Message- > From: ChenQi [mailto:qi.c...@windriver.com] > Sent: Monday, June 17, 2019 1:17 PM > To: Lei, Maohui/雷 茂慧; openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH v2] openssl: Fix a build bug on aarch64BE. > > On 06/06/2019 05:46 AM, Lei Maohui wrote: > > Fix bug as following on aarch64BE: > > > > Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' > > > > https://github.com/openssl/openssl/pull/9151 > > > > Upstream-Status: Submitted > > > > Signed-off-by: Lei Maohui > > --- > > ...01-Fix-build-error-for-aarch64-big-endian.patch | 41 > ++ > > .../recipes-connectivity/openssl/openssl_1.1.1c.bb | 1 + > > 2 files changed, 42 insertions(+) > > create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix- > build-error-for-aarch64-big-endian.patch > > > > diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error- > for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001- > Fix-build-error-for-aarch64-big-endian.patch > > new file mode 100644 > > index 000..65ca02c > > --- /dev/null > > +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for- > aarch64-big-endian.patch > > @@ -0,0 +1,41 @@ > > +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 > > +From: Lei Maohui > > +Date: Thu, 13 Jun 2019 12:17:30 +0900 > > +Subject: [PATCH] Fix build error for aarch64 big endian. > > + > > +Modified rev to rev64, because rev only takes integer registers. > > +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 > > +Otherwise, the following error will occur. > > + > > +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' > > + > > Put Upstream-Status here. > > Best Regards, > Chen Qi > > > +Signed-off-by: Lei Maohui > > +--- > > + crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/crypto/sha/asm/keccak1600-armv8.pl > > b/crypto/sha/asm/keccak1600- > armv8.pl > > +index dc72f18..6620690 100755 > > +--- a/crypto/sha/asm/keccak1600-armv8.pl > > b/crypto/sha/asm/keccak1600-armv8.pl > > +@@ -731,7 +731,7 @@ $code.=<<___; > > + blo .Lprocess_block_ce > > + ldr d31,[$inp],#8 // *inp++ > > + #ifdef__AARCH64EB__ > > +- rev v31.16b,v31.16b > > ++ rev64 v31.16b,v31.16b > > + #endif > > + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b > > + beq .Lprocess_block_ce > > +@@ -740,7 +740,7 @@ ___ > > + $code.=<<___; > > + ldr d31,[$inp],#8 // *inp++ > > + #ifdef__AARCH64EB__ > > +- rev v31.16b,v31.16b > > ++ rev64 v31.16b,v31.16b > > + #endif > > + eor $A[4][4],$A[4][4],v31.16b > > + > > +-- > > +2.7.4 > > + > > diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > > index 669b1a1..ec85ccd 100644 > > --- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > > +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > > @@ -16,6 +16,7 @@ SRC_URI = "http://www.openssl.org/source/openssl- > ${PV}.tar.gz \ > > file://0001-skip-test_symbol_presence.patch \ > > file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from- > co.patch \ > > file://afalg.patch \ > > + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ > > " > > > > SRC_URI_append_class-nativesdk = " \ > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] openssl: Fix a build bug on aarch64BE.
Hi Alex > Seems like a contributor agreement is needed for this patch? > https://www.openssl.org/policies/cla.html Thank you for your reminder. It seems necessary to do Contributor Agreements. I sent my CLA just now. Lei From: Alexander Kanavin [mailto:alex.kana...@gmail.com] Sent: Tuesday, June 18, 2019 7:24 PM To: Lei, Maohui Cc: OE-core Subject: Re: [OE-core] [PATCH v3] openssl: Fix a build bug on aarch64BE. On Tue, 18 Jun 2019 at 09:54, Lei Maohui mailto:leimao...@cn.fujitsu.com>> wrote: +Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/9151 Seems like a contributor agreement is needed for this patch? https://www.openssl.org/policies/cla.html Are you going to do tihs? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [master][warrior][PATCH] at: Fix a spelling mistake.
Signed-off-by: Lei Maohui --- meta/recipes-extended/at/at/pam.conf.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/at/at/pam.conf.patch b/meta/recipes-extended/at/at/pam.conf.patch index c9f337e..38e7fc1 100644 --- a/meta/recipes-extended/at/at/pam.conf.patch +++ b/meta/recipes-extended/at/at/pam.conf.patch @@ -24,7 +24,7 @@ index 3674c0a..2f8d586 100644 -@include common-auth -@include common-account +auth includecommon-auth -+acount includecommon-account ++account includecommon-account sessionrequired pam_loginuid.so -@include common-session-noninteractive +sessionincludecommon-session-noninteractive -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssl: Fix a build bug on aarch64BE.
Hi, Ross Thank you. I got it. I will submit v2 patch. Best regards Lei > -Original Message- > From: Burton, Ross [mailto:ross.bur...@intel.com] > Sent: Thursday, June 13, 2019 5:24 PM > To: Lei, Maohui > Cc: OE-core; Hong Liu > Subject: Re: [OE-core] [PATCH] openssl: Fix a build bug on aarch64BE. > > On Thu, 13 Jun 2019 at 09:48, Lei Maohui wrote: > > > > From: Hong Liu > > > > Fix bug as following on aarch64BE: > > > > Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' > > > > Upstream-Status: Pending [https://github.com/openssl/openssl/pull/9151] > > This line ^^^ > > > Signed-off-by: Lei Maohui > > --- > > ...01-Fix-build-error-for-aarch64-big-endian.patch | 41 > ++ > > .../recipes-connectivity/openssl/openssl_1.1.1c.bb | 1 + > > 2 files changed, 42 insertions(+) > > create mode 100644 > > meta/recipes-connectivity/openssl/openssl/0001-Fix-build- > error-for-aarch64-big-endian.patch > > > > diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error- > for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001- > Fix-build-error-for-aarch64-big-endian.patch > > new file mode 100644 > > index 000..65ca02c > > --- /dev/null > > +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for- > aarch64-big-endian.patch > > @@ -0,0 +1,41 @@ > > +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 > > +From: Lei Maohui > > +Date: Thu, 13 Jun 2019 12:17:30 +0900 > > +Subject: [PATCH] Fix build error for aarch64 big endian. > > + > > +Modified rev to rev64, because rev only takes integer registers. > > +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 > > +Otherwise, the following error will occur. > > + > > +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' > > + > > ^^ goes here. > > The upstream status is a property of the patch you're adding, not the > commit message. > > > +Signed-off-by: Lei Maohui > > +--- > > + crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/crypto/sha/asm/keccak1600-armv8.pl > > b/crypto/sha/asm/keccak1600- > armv8.pl > > +index dc72f18..6620690 100755 > > +--- a/crypto/sha/asm/keccak1600-armv8.pl > > b/crypto/sha/asm/keccak1600-armv8.pl > > +@@ -731,7 +731,7 @@ $code.=<<___; > > + blo .Lprocess_block_ce > > + ldr d31,[$inp],#8 // *inp++ > > + #ifdef__AARCH64EB__ > > +- rev v31.16b,v31.16b > > ++ rev64 v31.16b,v31.16b > > + #endif > > + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b > > + beq .Lprocess_block_ce > > +@@ -740,7 +740,7 @@ ___ > > + $code.=<<___; > > + ldr d31,[$inp],#8 // *inp++ > > + #ifdef__AARCH64EB__ > > +- rev v31.16b,v31.16b > > ++ rev64 v31.16b,v31.16b > > + #endif > > + eor $A[4][4],$A[4][4],v31.16b > > + > > +-- > > +2.7.4 > > + > > diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > > index 669b1a1..ec85ccd 100644 > > --- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > > +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > > @@ -16,6 +16,7 @@ SRC_URI = "http://www.openssl.org/source/openssl- > ${PV}.tar.gz \ > > file://0001-skip-test_symbol_presence.patch \ > > file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from- > co.patch \ > > file://afalg.patch \ > > + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ > > " > > > > SRC_URI_append_class-nativesdk = " \ > > -- > > 2.7.4 > > > > > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssl: Fix a build bug on aarch64BE.
Hi, Alex I refered to the previous patches. Should the Upstream-Status be “Submitted” ? Best regards Lei From: Alexander Kanavin [mailto:alex.kana...@gmail.com] Sent: Thursday, June 13, 2019 8:45 PM To: Burton, Ross Cc: Lei, Maohui/雷 茂慧; Hong Liu; OE-core Subject: Re: [OE-core] [PATCH] openssl: Fix a build bug on aarch64BE. Also if the patch is already submitted, the status should not be Pending. Alex On Thu, 13 Jun 2019 at 11:23, Burton, Ross mailto:ross.bur...@intel.com>> wrote: On Thu, 13 Jun 2019 at 09:48, Lei Maohui mailto:leimao...@cn.fujitsu.com>> wrote: > > From: Hong Liu mailto:hongl.f...@cn.fujitsu.com>> > > Fix bug as following on aarch64BE: > > Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' > > Upstream-Status: Pending [https://github.com/openssl/openssl/pull/9151] This line ^^^ > Signed-off-by: Lei Maohui > mailto:leimao...@cn.fujitsu.com>> > --- > ...01-Fix-build-error-for-aarch64-big-endian.patch | 41 > ++ > .../recipes-connectivity/openssl/openssl_1.1.1c.bb<http://openssl_1.1.1c.bb> > | 1 + > 2 files changed, 42 insertions(+) > create mode 100644 > meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch > > diff --git > a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch > > b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch > new file mode 100644 > index 000..65ca02c > --- /dev/null > +++ > b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch > @@ -0,0 +1,41 @@ > +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 > +From: Lei Maohui mailto:leimao...@cn.fujitsu.com>> > +Date: Thu, 13 Jun 2019 12:17:30 +0900 > +Subject: [PATCH] Fix build error for aarch64 big endian. > + > +Modified rev to rev64, because rev only takes integer registers. > +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 > +Otherwise, the following error will occur. > + > +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' > + ^^ goes here. The upstream status is a property of the patch you're adding, not the commit message. > +Signed-off-by: Lei Maohui > mailto:leimao...@cn.fujitsu.com>> > +--- > + crypto/sha/asm/keccak1600-armv8.pl<http://keccak1600-armv8.pl> | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/crypto/sha/asm/keccak1600-armv8.pl<http://keccak1600-armv8.pl> > b/crypto/sha/asm/keccak1600-armv8.pl<http://keccak1600-armv8.pl> > +index dc72f18..6620690 100755 > +--- a/crypto/sha/asm/keccak1600-armv8.pl<http://keccak1600-armv8.pl> > b/crypto/sha/asm/keccak1600-armv8.pl<http://keccak1600-armv8.pl> > +@@ -731,7 +731,7 @@ $code.=<<___; > + blo .Lprocess_block_ce > + ldr d31,[$inp],#8 // *inp++ > + #ifdef__AARCH64EB__ > +- rev v31.16b,v31.16b > ++ rev64 v31.16b,v31.16b > + #endif > + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b > + beq .Lprocess_block_ce > +@@ -740,7 +740,7 @@ ___ > + $code.=<<___; > + ldr d31,[$inp],#8 // *inp++ > + #ifdef__AARCH64EB__ > +- rev v31.16b,v31.16b > ++ rev64 v31.16b,v31.16b > + #endif > + eor $A[4][4],$A[4][4],v31.16b > + > +-- > +2.7.4 > + > diff --git > a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb<http://openssl_1.1.1c.bb> > > b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb<http://openssl_1.1.1c.bb> > index 669b1a1..ec85ccd 100644 > --- > a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb<http://openssl_1.1.1c.bb> > +++ > b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb<http://openssl_1.1.1c.bb> > @@ -16,6 +16,7 @@ SRC_URI = > "http://www.openssl.org/source/openssl-${PV}.tar.gz<http://www.openssl.org/source/openssl-$%7BPV%7D.tar.gz> > \ > file://0001-skip-test_symbol_presence.patch \ > > file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ > file://afalg.patch \ > + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ > " > > SRC_URI_append_class-nativesdk = " \ > -- > 2.7.4 > > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org> http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [warrior][PATCH v3] openssl: Fix a build bug on aarch64BE.
ping > -Original Message- > From: Lei, Maohui > Sent: Thursday, June 06, 2019 11:05 AM > To: openembedded-core@lists.openembedded.org > Cc: Lei, Maohui > Subject: [OE-core][warrior][PATCH v3] openssl: Fix a build bug on aarch64BE. > > Fix bug as following on aarch64BE: > > Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' > > Signed-off-by: Lei Maohui > --- > ...01-Fix-build-error-for-aarch64-big-endian.patch | 43 > ++ > .../recipes-connectivity/openssl/openssl_1.1.1b.bb | 1 + > 2 files changed, 44 insertions(+) > create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-build- > error-for-aarch64-big-endian.patch > > diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error- > for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001- > Fix-build-error-for-aarch64-big-endian.patch > new file mode 100644 > index 000..9a90a68 > --- /dev/null > +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for- > aarch64-big-endian.patch > @@ -0,0 +1,43 @@ > +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 > +From: Lei Maohui > +Date: Thu, 13 Jun 2019 12:17:30 +0900 > +Subject: [PATCH] Fix build error for aarch64 big endian. > + > +Modified rev to rev64, because rev only takes integer registers. > +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 > +Otherwise, the following error will occur. > + > +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' > + > +Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/9151] > + > +Signed-off-by: Lei Maohui > +--- > + crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600- > armv8.pl > +index dc72f18..6620690 100755 > +--- a/crypto/sha/asm/keccak1600-armv8.pl > b/crypto/sha/asm/keccak1600-armv8.pl > +@@ -731,7 +731,7 @@ $code.=<<___; > + blo .Lprocess_block_ce > + ldr d31,[$inp],#8 // *inp++ > + #ifdef __AARCH64EB__ > +-rev v31.16b,v31.16b > ++rev64 v31.16b,v31.16b > + #endif > + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b > + beq .Lprocess_block_ce > +@@ -740,7 +740,7 @@ ___ > + $code.=<<___; > + ldr d31,[$inp],#8 // *inp++ > + #ifdef __AARCH64EB__ > +-rev v31.16b,v31.16b > ++rev64 v31.16b,v31.16b > + #endif > + eor $A[4][4],$A[4][4],v31.16b > + > +-- > +2.7.4 > + > diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb > b/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb > index d3404d2..46030c3 100644 > --- a/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb > +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb > @@ -17,6 +17,7 @@ SRC_URI = > "http://www.openssl.org/source/openssl-${PV}.tar.gz > \ > file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from- > co.patch \ > file://afalg.patch \ > file://CVE-2019-1543.patch \ > + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ > " > > SRC_URI_append_class-nativesdk = " \ > -- > 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [master][warrior][PATCH] at: Fix a spelling mistake.
Hi Ross > You do more than fix a spelling mistake in that commit. Please > explain the other changes. I'm sorry, I don't understand. I just fixed "acount" to "account". I didn't do redundant change. > > -+acount includecommon-account > > ++account includecommon-account Best regards Lei > -Original Message- > From: Burton, Ross [mailto:ross.bur...@intel.com] > Sent: Wednesday, June 12, 2019 5:33 PM > To: Lei, Maohui > Cc: OE-core > Subject: Re: [OE-core] [master][warrior][PATCH] at: Fix a spelling mistake. > > You do more than fix a spelling mistake in that commit. Please > explain the other changes. > > Ross > > On Wed, 12 Jun 2019 at 04:09, Lei Maohui wrote: > > > > Signed-off-by: Lei Maohui > > --- > > meta/recipes-extended/at/at/pam.conf.patch | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-extended/at/at/pam.conf.patch b/meta/recipes- > extended/at/at/pam.conf.patch > > index c9f337e..38e7fc1 100644 > > --- a/meta/recipes-extended/at/at/pam.conf.patch > > +++ b/meta/recipes-extended/at/at/pam.conf.patch > > @@ -24,7 +24,7 @@ index 3674c0a..2f8d586 100644 > > -@include common-auth > > -@include common-account > > +auth includecommon-auth > > -+acount includecommon-account > > ++account includecommon-account > > sessionrequired pam_loginuid.so > > -@include common-session-noninteractive > > +sessionincludecommon-session-noninteractive > > -- > > 2.7.4 > > > > > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [warrior][PATCH] openssl: Fix a build bug on aarch64BE.
Fix bug as following on aarch64BE: Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' Upstream-Status: Pending [https://github.com/openssl/openssl/pull/9151] Signed-off-by: Lei Maohui --- ...01-Fix-build-error-for-aarch64-big-endian.patch | 41 ++ .../recipes-connectivity/openssl/openssl_1.1.1b.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch new file mode 100644 index 000..65ca02c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch @@ -0,0 +1,41 @@ +From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Thu, 13 Jun 2019 12:17:30 +0900 +Subject: [PATCH] Fix build error for aarch64 big endian. + +Modified rev to rev64, because rev only takes integer registers. +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 +Otherwise, the following error will occur. + +Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' + +Signed-off-by: Lei Maohui +--- + crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +index dc72f18..6620690 100755 +--- a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl +@@ -731,7 +731,7 @@ $code.=<<___; + blo .Lprocess_block_ce + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b + beq .Lprocess_block_ce +@@ -740,7 +740,7 @@ ___ + $code.=<<___; + ldr d31,[$inp],#8 // *inp++ + #ifdef__AARCH64EB__ +- rev v31.16b,v31.16b ++ rev64 v31.16b,v31.16b + #endif + eor $A[4][4],$A[4][4],v31.16b + +-- +2.7.4 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb index d3404d2..46030c3 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://CVE-2019-1543.patch \ + file://0001-Fix-build-error-for-aarch64-big-endian.patch \ " SRC_URI_append_class-nativesdk = " \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
Hi, This patch hasn't been merged yet. Are there any suggestions? Best regards Lei > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > Sent: Wednesday, May 08, 2019 11:36 AM > To: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > Ping > > > -Original Message- > > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > > Sent: Friday, April 26, 2019 1:56 PM > > To: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > > > Hi, > > > > I noticed that " dnf: Enable nativesdk " has been merged into master-next. > This > > patch is necessary for dnf-nativesdk, so please merge too. > > > > Best regards > > Lei > > > > > > > -Original Message- > > > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded- > > > core-boun...@lists.openembedded.org] On Behalf Of Zheng, Ruoqin > > > Sent: Friday, April 19, 2019 10:55 AM > > > To: openembedded-core@lists.openembedded.org > > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in > toolchain > > > > > > ping > > > > > > -- > > > Zheng Ruoqin > > > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > > > ADDR.: No.6 Wenzhu Road, Software Avenue, > > >Nanjing, 210012, China > > > MAIL : zhengrq.f...@cn.fujistu.com > > > > > > > > > > -Original Message- > > > > From: Zheng, Ruoqin > > > > Sent: Saturday, April 13, 2019 10:37 PM > > > > To: openembedded-core@lists.openembedded.org > > > > Cc: Zheng, Ruoqin > > > > Subject: [OE-core][PATCH] toolchain-scripts: make rpm work in toolchain > > > > > > > > Rpm need to read the arch info, but $script did not provide it, so add > > > > it. > > > > > > > > Signed-off-by: Zheng Ruoqin > > > > --- > > > > meta/classes/toolchain-scripts.bbclass | 1 + > > > > 1 file changed, 1 insertion(+) > > > > > > > > diff --git a/meta/classes/toolchain-scripts.bbclass > > b/meta/classes/toolchain- > > > > scripts.bbclass > > > > index 1a2ec4f..de50b7e 100644 > > > > --- a/meta/classes/toolchain-scripts.bbclass > > > > +++ b/meta/classes/toolchain-scripts.bbclass > > > > @@ -101,6 +101,7 @@ toolchain_shared_env_script () { > > > > echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script > > > > echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script > > > > echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> > > > > $script > > > > + echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script > > > > echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script > > > > echo 'export ARCH=${ARCH}' >> $script > > > > echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script > > > > -- > > > > 1.8.3.1 > > > > > > > > > > > > -- > > > ___ > > > Openembedded-core mailing list > > > Openembedded-core@lists.openembedded.org > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] meson.bbclass: Make meson support aarch64_be.
Added aarch64_be into cpu family. Signed-off-by: Lei Maohui --- meta/classes/meson.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 115d1ae..0edbfc1 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -56,6 +56,8 @@ def meson_cpu_family(var, d): return 'ppc64' elif arch == 'armeb': return 'arm' +elif arch == 'aarch64_be': +return 'aarch64' elif arch == 'mipsel': return 'mips' elif arch == 'mips64el': -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] meson.bbclass: Make meson support aarch64_be.
Added aarch64_be into cpu family. Signed-off-by: Lei Maohui --- meta/classes/meson.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 115d1ae..0edbfc1 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -56,6 +56,8 @@ def meson_cpu_family(var, d): return 'ppc64' elif arch == 'armeb': return 'arm' +elif arch == 'aarch64_be': +return 'aarch64' elif arch == 'mipsel': return 'mips' elif arch == 'mips64el': -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] icu: Added armeb support.
Make icu support arm32 BE. Upstream-Status: Pending Signed-off-by: Lei Maohui --- .../icu/icu/0001-Make-icu-support-arm-BE.patch | 28 ++ meta/recipes-support/icu/icu_64.2.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch diff --git a/meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch b/meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch new file mode 100644 index 000..019d09e --- /dev/null +++ b/meta/recipes-support/icu/icu/0001-Make-icu-support-arm-BE.patch @@ -0,0 +1,28 @@ +From 8fa6cbf2d3de73bdca5e65f6523e4cce334aeee7 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Fri, 14 Dec 2018 16:07:31 +0900 +Subject: [PATCH] Make icu support arm BE. + +Upstream-Status: Pending + +Signed-off-by: Lei Maohui +--- + i18n/double-conversion-utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h +index 0bd3e83..9288e28 100644 +--- a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h +@@ -77,7 +77,7 @@ inline void abort_noreturn() { abort(); } + // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) + // ICU PATCH: Enable ARM32 & ARM64 builds for Windows with 'defined(_M_ARM) || defined(_M_ARM64)'. + #if defined(_M_X64) || defined(__x86_64__) || \ +-defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ ++defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ +-- +2.7.4 + diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_64.2.bb index bbc76d6..2e38a3f 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_64.2.bb @@ -17,6 +17,7 @@ SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ file://0001-Fix-big-endian-build.patch \ + file://0001-Make-icu-support-arm-BE.patch \ " SRC_URI_append_class-target = "\ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
Ping > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Lei, Maohui > Sent: Friday, April 26, 2019 1:56 PM > To: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > Hi, > > I noticed that " dnf: Enable nativesdk " has been merged into master-next. > This > patch is necessary for dnf-nativesdk, so please merge too. > > Best regards > Lei > > > > -Original Message- > > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > > core-boun...@lists.openembedded.org] On Behalf Of Zheng, Ruoqin > > Sent: Friday, April 19, 2019 10:55 AM > > To: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > > > ping > > > > -- > > Zheng Ruoqin > > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > > ADDR.: No.6 Wenzhu Road, Software Avenue, > >Nanjing, 210012, China > > MAIL : zhengrq.f...@cn.fujistu.com > > > > > > > -Original Message- > > > From: Zheng, Ruoqin > > > Sent: Saturday, April 13, 2019 10:37 PM > > > To: openembedded-core@lists.openembedded.org > > > Cc: Zheng, Ruoqin > > > Subject: [OE-core][PATCH] toolchain-scripts: make rpm work in toolchain > > > > > > Rpm need to read the arch info, but $script did not provide it, so add it. > > > > > > Signed-off-by: Zheng Ruoqin > > > --- > > > meta/classes/toolchain-scripts.bbclass | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/meta/classes/toolchain-scripts.bbclass > b/meta/classes/toolchain- > > > scripts.bbclass > > > index 1a2ec4f..de50b7e 100644 > > > --- a/meta/classes/toolchain-scripts.bbclass > > > +++ b/meta/classes/toolchain-scripts.bbclass > > > @@ -101,6 +101,7 @@ toolchain_shared_env_script () { > > > echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script > > > echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script > > > echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> > > > $script > > > + echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script > > > echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script > > > echo 'export ARCH=${ARCH}' >> $script > > > echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script > > > -- > > > 1.8.3.1 > > > > > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] icu: Added armeb support.
Make icu support arm32 BE. Upstream-Status: Pending Signed-off-by: Lei Maohui --- .../icu/icu/0001-icu-Added-armeb-support.patch | 30 ++ meta/recipes-support/icu/icu_64.2.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch diff --git a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch new file mode 100644 index 000..299689d --- /dev/null +++ b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch @@ -0,0 +1,30 @@ +From 500321387ceca48934bb0f323779117cd518bab6 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Wed, 8 May 2019 14:42:30 +0900 +Subject: [PATCH] icu: Added armeb support. + +Make icu support arm32 BE. + +Upstream-Status: Pending + +Signed-off-by: Lei Maohui +--- + i18n/double-conversion-utils.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h +index 1e44fca..e4f2a8b 100644 +--- a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h +@@ -92,7 +92,7 @@ int main(int argc, char** argv) { + // + // If it prints "correct" then the architecture should be here, in the "correct" section. + #if defined(_M_X64) || defined(__x86_64__) || \ +-defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ ++defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ +-- +2.7.4 + diff --git a/meta/recipes-support/icu/icu_64.2.bb b/meta/recipes-support/icu/icu_64.2.bb index bbc76d6..10bac7a 100644 --- a/meta/recipes-support/icu/icu_64.2.bb +++ b/meta/recipes-support/icu/icu_64.2.bb @@ -17,6 +17,7 @@ SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ file://0001-Fix-big-endian-build.patch \ + file://0001-icu-Added-armeb-support.patch \ " SRC_URI_append_class-target = "\ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4] dnf: Enable nativesdk
Make dnf work on nativesdk environment. Signed-off-by: Zheng Ruoqin Signed-off-by: Lei Maohui --- meta/recipes-devtools/dnf/dnf_4.2.2.bb | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index 3970b41..c33 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -26,7 +26,7 @@ EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} - BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN}_class-target += " \ +RDEPENDS_${PN} += " \ python3-core \ python3-codecs \ python3-netclient \ @@ -49,6 +49,8 @@ RDEPENDS_${PN}_class-target += " \ python3-gpg \ " +RDEPENDS_${PN}_class-native = "" + RRECOMMENDS_${PN}_class-target += "gnupg" # Create a symlink called 'dnf' as 'make install' does not do it, but @@ -66,6 +68,12 @@ do_install_append_class-native() { RPM_NO_CHROOT_FOR_SCRIPTS=1 } +do_install_append_class-nativesdk() { +create_wrapper ${D}/${bindir}/dnf \ +RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ +RPM_NO_CHROOT_FOR_SCRIPTS=1 +} + SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic.service dnf-automatic.timer \ dnf-automatic-download.service dnf-automatic-download.timer \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] dnf: Enable nativesdk
Hi, > Patch doesn't apply against master? I will update this patch for new version dnf. Best regards. Lei > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Richard Purdie > Sent: Tuesday, April 23, 2019 9:35 PM > To: Zheng, Ruoqin/郑 若钦; openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH v2] dnf: Enable nativesdk > > On Sat, 2019-04-13 at 22:35 +0800, Zheng Ruoqin wrote: > > Make dnf work on nativesdk environment. > > > > Signed-off-by: Zheng Ruoqin > > --- > > meta/recipes-devtools/dnf/dnf_4.1.0.bb | 10 +- > > 1 file changed, 9 insertions(+), 1 deletion(-) > > Patch doesn't apply against master? > > Cheers, > > Richard > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] dnf: Enable nativesdk
Make dnf work on nativesdk environment. Signed-off-by: Zheng Ruoqin Signed-off-by: Lei Maohui --- meta/recipes-devtools/dnf/dnf_4.2.2.bb | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index 3970b41..159d7e9 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -26,7 +26,7 @@ EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} - BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN}_class-target += " \ +RDEPENDS_${PN} += " \ python3-core \ python3-codecs \ python3-netclient \ @@ -49,6 +49,8 @@ RDEPENDS_${PN}_class-target += " \ python3-gpg \ " +RDEPENDS_${PN}_class-native = "" + RRECOMMENDS_${PN}_class-target += "gnupg" # Create a symlink called 'dnf' as 'make install' does not do it, but @@ -66,6 +68,11 @@ do_install_append_class-native() { RPM_NO_CHROOT_FOR_SCRIPTS=1 } +do_install_append_class-nativesdk() { +create_wrapper ${D}/${bindir}/dnf \ +RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ +RPM_NO_CHROOT_FOR_SCRIPTS=1 } + SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic.service dnf-automatic.timer \ dnf-automatic-download.service dnf-automatic-download.timer \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
Hi, I noticed that " dnf: Enable nativesdk " has been merged into master-next. This patch is necessary for dnf-nativesdk, so please merge too. Best regards Lei > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded- > core-boun...@lists.openembedded.org] On Behalf Of Zheng, Ruoqin > Sent: Friday, April 19, 2019 10:55 AM > To: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > ping > > -- > Zheng Ruoqin > Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) > ADDR.: No.6 Wenzhu Road, Software Avenue, >Nanjing, 210012, China > MAIL : zhengrq.f...@cn.fujistu.com > > > > -Original Message- > > From: Zheng, Ruoqin > > Sent: Saturday, April 13, 2019 10:37 PM > > To: openembedded-core@lists.openembedded.org > > Cc: Zheng, Ruoqin > > Subject: [OE-core][PATCH] toolchain-scripts: make rpm work in toolchain > > > > Rpm need to read the arch info, but $script did not provide it, so add it. > > > > Signed-off-by: Zheng Ruoqin > > --- > > meta/classes/toolchain-scripts.bbclass | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/meta/classes/toolchain-scripts.bbclass > > b/meta/classes/toolchain- > > scripts.bbclass > > index 1a2ec4f..de50b7e 100644 > > --- a/meta/classes/toolchain-scripts.bbclass > > +++ b/meta/classes/toolchain-scripts.bbclass > > @@ -101,6 +101,7 @@ toolchain_shared_env_script () { > > echo 'export CPPFLAGS="${TARGET_CPPFLAGS}"' >> $script > > echo 'export KCFLAGS="--sysroot=$SDKTARGETSYSROOT"' >> $script > > echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> > > $script > > + echo 'export MACHINE_ARCH=${MACHINE_ARCH}' >> $script > > echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script > > echo 'export ARCH=${ARCH}' >> $script > > echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script > > -- > > 1.8.3.1 > > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core